LimeSurvey: develop 1a603fda

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-12-04 19:20 develop 93505415
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Dev: no CRSF in uploader ?

Conflicts:

application/controllers/UploaderController.php

application/models/UserInGroup.php

assets/scripts/uploader.js
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/extensions/LimeScript/LimeScript.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/checkintegrity/fix_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
mod - assets/packages/adminbasics/css/lime-admin-common.css Diff File
mod - assets/packages/adminbasics/src/components/confirmdeletemodal.js Diff File
mod - assets/packages/adminbasics/src/components/gridAction.js Diff File
mod - assets/packages/adminbasics/src/parts/globalMethods.js Diff File
mod - assets/scripts/admin/assessments.js Diff File
mod - assets/scripts/admin/participantpanel.js Diff File
mod - assets/scripts/admin/users.js Diff File