LimeSurvey: develop 693dabcc

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-07-13 10:31:05 develop 84117710
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/internal.php
application/config/version.php
tests/surveys/EndUrlRedirectTest.php
mod - .gitignore Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.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/update/updatedb_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/survey/subview/accordion/_presentation_panel.php Diff File
mod - application/views/admin/survey/surveybar_displayexport.php Diff File
mod - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.js Diff File
mod - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.min.js Diff File
mod - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.src.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/questions/numeric-slider/css/numeric-slider.css Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.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/fr/fr.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - themes/survey/bootswatch/css/theme.css Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/css/theme.css Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File
mod - themes/survey/vanilla/css/theme.css Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig Diff File