LimeSurvey: 2.1 9880c042

Author Committer Branch Timestamp Parent
Mazi Mazi 2.1 2012-11-29 15:35 2.1 67aaf287
Changeset

Merge branch '2.1' of https://github.com/LimeSurvey/LimeSurvey.git into 2.1

mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/User.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/NumericalQuestion.php Diff File
add - application/views/admin/emailtemplates/email_language_tab.php Diff File
add - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_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/installer/precheck_view.php Diff File
mod - docs/release_notes.txt Diff File
add - images/cut.gif Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/emailtemplates.js Diff File
mod - scripts/admin/subquestions.js Diff File