LimeSurvey: develop 38ef7ac1

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-04-11 12:27 develop b0292741
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/internal.php
application/config/version.php
application/core/LSETwigViewRenderer.php
application/helpers/frontend_helper.php
application/views/admin/survey/breadcrumb.php
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/Box.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/dataentry/import.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/_activation_feedback.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
add - application/views/admin/themeoptions/import_modal.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
add - application/views/admin/themeoptions/surveythememenu.php Diff File
mod - application/views/admin/themes/importuploaded_view.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/themes/templatesummary_view.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
add - assets/packages/adminbasics/js/confirmdeletemodal.js Diff File
mod - assets/packages/limesurvey/survey.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/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/ja/ja.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 - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/sr/sr.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/TestHelper.php Diff File
mod - tests/bootstrap.php Diff File
rm - tests/controllers/TemplateControllerTest.php Diff
add - tests/controllers/ThemeControllerTest.php Diff File
add - tests/data/file_upload/dalahorse.jpg Diff File
mod - tests/data/travis/travis_setup.sh Diff File
mod - tests/models/TemplateInstanceTest.php Diff File
mod - themes/admin/favicon.ico 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
mod - themes/survey/vanilla/views/subviews/header/head.twig Diff File
mod - themes/survey/vanilla/views/subviews/header/progress_bar.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/welcome.twig Diff File
mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_desc.twig Diff File
mod - themes/survey/vanilla/views/subviews/survey/group_subviews/group_name.twig Diff File