LimeSurvey: 2.1 79e21513

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.1 2013-03-05 12:47 2.1 c011f106
Changeset

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

Conflicts:
application/views/admin/survey/QuestionGroups/addGroup_view.php
application/views/admin/token/csvupload.php
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
add - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/limereplacementfields/dialogs/limereplacementfields.js Diff File
add - scripts/admin/listresponse.js Diff File
mod - scripts/admin/sharePanel.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/date.js Diff File