LimeSurvey: develop 503b0c7c

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-08-07 13:00:11 develop e4aaa311
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/helpers/export_helper.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/usergroup/mailUserGroup_view.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/components/panelsanimation.js Diff File
mod - assets/packages/adminbasics/src/pages/quickaction.js Diff File
mod - assets/packages/adminbasics/webpack.config.js Diff File
mod - docs/release_notes.txt Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es-MX/es-MX.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fa/fa.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ms/ms.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/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/views/subviews/navigation/clearall_buttons.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/navigator_complement.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/save_buttons.twig Diff File