LimeSurvey: 2.1 be77e656

Author Committer Branch Timestamp Parent
sammousa sammousa 2.1 2012-12-13 15:11 2.1 df17cea0
Changeset

Revert "Revert "Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1""

This reverts commit 241a44ccb43e0b481801e8313673b1d53917e2da.

mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/models/Answers.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - scripts/admin/attributeControl.js Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/sharePanel.js Diff File
mod - scripts/admin/tokens.js Diff File