LimeSurvey: 2.05 44f6a6c8

Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-06-10 13:58:36 2.05 6e842cd8
Changeset

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

mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/export/ExcelWriter.php Diff File
mod - application/helpers/admin/export/PdfWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.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/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
add - application/views/admin/dataentry/vvimport_result.php Diff File
rm - application/views/admin/dataentry/vvimport_upload.php Diff File
rm - application/views/admin/dataentry/warning_header.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/update/update.php Diff File
mod - docs/release_notes.txt Diff File
add - locale/oc/LC_MESSAGES/index.html Diff File
add - locale/oc/LC_MESSAGES/oc.mo Diff File
add - locale/oc/index.html Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles/adminstyle.css Diff File