LimeSurvey: develop 15efcfdf

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-25 13:12 develop b2ff9113
Changeset

Merge branch 'master' into develop

Conflicts:
application/controllers/admin/questions.php
application/core/LSHttpRequest.php
mod - application/config/version.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - assets/packages/pjax/min/pjax.combined.min.js Diff File
mod - assets/packages/pjax/min/pjax.min.js Diff File
mod - assets/packages/pjax/pjax.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/TestBaseClassWeb.php Diff File
mod - tests/surveys/EndUrlRedirectTest.php Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/views/layout_survey_list.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/firstpage.twig Diff File
add - themes/survey/vanilla/views/subviews/navigation/language_changer.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer_first_page.twig Diff File
add - themes/survey/vanilla/views/subviews/navigation/language_changer_form.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_form.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_head.twig Diff File
mod - themes/survey/vanilla/views/subviews/registration/required.twig Diff File