LimeSurvey: develop a4b1caec

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-07-09 12:19:25 develop d6692acd
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/internal.php
application/controllers/UploaderController.php
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/labels/_labelviewquickadd_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_modals.twig Diff File
mod - application/views/admin/survey/surveybar_activation.php Diff File
mod - application/views/admin/survey/surveybar_displayexport.php Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - docs/release_notes.txt Diff File
mod - framework/db/schema/mssql/CMssqlSqlsrvPdoAdapter.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - themes/survey/bootswatch/config.xml Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File