LimeSurvey: master bca2e119

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master 2021-01-12 09:30 master f2f4991c
Changeset

Merge branch 'develop' into develop_permission_Fixes_14551

Conflicts:

application/models/SurveysGroups.php
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/core/LSYii_ImageValidator.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
add - application/extensions/TopbarWidget/README.md Diff File
mod - application/extensions/TopbarWidget/views/includes/listquestiongroupsTopbarLeft_view.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/template_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/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/modifyuser.php Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/summary.php Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/ro/ro.mo Diff File