LimeSurvey: 2.05 a90147a3

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.05 2013-03-18 12:08 2.05 c9b97aec
Changeset

Merge remote-tracking branch 'origin/2.05' into 2.05

Conflicts:
application/hooks/ExceptionHook.php
mod - .htaccess Diff File
mod - application/config/third_party.php Diff File
rm - application/hooks/ExceptionHook.php Diff
mod - application/views/admin/super/header.php Diff File
add - plugins/index.html Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/surveytoolbar.js Diff File
mod - scripts/ranking.js Diff File
mod - scripts/survey_runtime.js Diff File
add - third_party/jquery-qtip/.gitignore Diff File
rm - third_party/jquery-qtip/INSTALL Diff
rm - third_party/jquery-qtip/LICENSE Diff
add - third_party/jquery-qtip/LICENSE-GPL Diff File
add - third_party/jquery-qtip/LICENSE-MIT Diff File
add - third_party/jquery-qtip/README.md Diff File
rm - third_party/jquery-qtip/REQUIREMENTS Diff
add - third_party/jquery-qtip/dist/basic/jquery.qtip.css Diff File
add - third_party/jquery-qtip/dist/basic/jquery.qtip.js Diff File
add - third_party/jquery-qtip/dist/basic/jquery.qtip.min.css Diff File
add - third_party/jquery-qtip/dist/basic/jquery.qtip.min.js Diff File
add - third_party/jquery-qtip/dist/jquery.qtip.css Diff File
add - third_party/jquery-qtip/dist/jquery.qtip.js Diff File
add - third_party/jquery-qtip/dist/jquery.qtip.min.css Diff File
add - third_party/jquery-qtip/dist/jquery.qtip.min.js Diff File
add - third_party/jquery-qtip/grunt.js Diff File
rm - third_party/jquery-qtip/jquery.qtip-1.0.0-rc3.min.js Diff
add - third_party/jquery-qtip/libs/jquery-loader.js Diff File
add - third_party/jquery-qtip/libs/jquery/jquery.js Diff File
add - third_party/jquery-qtip/package.json Diff File
add - third_party/jquery-qtip/src/ajax/ajax.js Diff File
add - third_party/jquery-qtip/src/basic.css Diff File
add - third_party/jquery-qtip/src/core.css Diff File
add - third_party/jquery-qtip/src/core.js Diff File
add - third_party/jquery-qtip/src/css3.css Diff File
add - third_party/jquery-qtip/src/ie6/ie6.css Diff File
add - third_party/jquery-qtip/src/ie6/ie6.js Diff File
add - third_party/jquery-qtip/src/imagemap/imagemap.js Diff File
add - third_party/jquery-qtip/src/intro.js Diff File
add - third_party/jquery-qtip/src/modal/modal.css Diff File
add - third_party/jquery-qtip/src/modal/modal.js Diff File
add - third_party/jquery-qtip/src/outro.js Diff File
add - third_party/jquery-qtip/src/svg/svg.js Diff File
add - third_party/jquery-qtip/src/tips/tips.css Diff File
add - third_party/jquery-qtip/src/tips/tips.js Diff File
add - third_party/jquery-qtip/src/viewport/viewport.js Diff File
add - third_party/jquery/jquery-1.9.1.js Diff File
add - third_party/jquery/jquery-1.9.1.min.js Diff File