LimeSurvey: 2.06 fada7d82

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.06 2015-01-26 09:37 2.06 8e29f3fd
Changeset

Merge branch '2.06' of github.com:LimeSurvey/LimeSurvey into 2.06temp

Conflicts:
application/helpers/admin/activate_helper.php
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/helpers/common_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/qanda_helper.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/survey/subview/tabTokens_view.php Diff File
mod - application/views/admin/survey/subview/tab_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/surveysettings.js Diff File