LimeSurvey: 2.05 d9b94371

Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-11-12 14:58 2.05 421cb5df
Changeset

Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

mod - application/config/third_party.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/date.js Diff File
mod - styles/adminstyle.css Diff File
add - styles/gringegreen/jquery-ui/images/animated-overlay.gif Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_e2f6be_40x100.png Diff File
add - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_f3fce2_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fafafa_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_100_fefefe_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_50_aaaaaa_40x100.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-bg_flat_55_fafafa_40x100.png Diff File
add - styles/gringegreen/jquery-ui/images/ui-bg_flat_95_fef1ec_40x100.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png Diff
mod - styles/gringegreen/jquery-ui/images/ui-icons_1f871c_256x240.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-icons_4e8632_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_5fab2b_256x240.png Diff
add - styles/gringegreen/jquery-ui/images/ui-icons_85bd00_256x240.png Diff File
mod - styles/gringegreen/jquery-ui/images/ui-icons_cd0a0a_256x240.png Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
add - third_party/jquery-bindWithDelay/README Diff File
add - third_party/jquery-bindWithDelay/bind.html Diff File
add - third_party/jquery-bindWithDelay/bindWithDelay.js Diff File
add - third_party/jquery-bindWithDelay/demo/jquery-1.6.1.js Diff File
add - third_party/jquery-bindWithDelay/demo/jquery-1.9.1.js Diff File
add - third_party/jquery-bindWithDelay/demo/styles.css Diff File
add - third_party/jquery-bindWithDelay/index.html Diff File
add - third_party/jquery-bindWithDelay/onDelay.js Diff File
add - third_party/jquery-bindWithDelay/test/index.html Diff File
add - third_party/jquery-bindWithDelay/test/qunit.css Diff File
add - third_party/jquery-bindWithDelay/test/qunit.js Diff File
add - third_party/jquery-bindWithDelay/test/test.js Diff File