LimeSurvey: master_fixDeleteResponse_urlget 6b9abcc4

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master_fixDeleteResponse_urlget 2018-11-12 18:19 master_fixDeleteResponse_urlget bb3c7cee
Changeset

Merge branch 'master' into master_fixDeleteResponse_urlget

Conflicts:

application/models/SurveyDynamic.php

assets/packages/adminbasics/build/adminbasics.min.css

assets/packages/adminbasics/build/adminbasics.min.js
mod - application/config/version.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
add - application/core/plugins/GroupSpecificActivation Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/token/managetokenattributes.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.js Diff File
mod - assets/packages/adminbasics/src/parts/globalMethods.js Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.twig Diff File