LimeSurvey: develop b24a6dc1

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-13 14:43:25 develop fe7c657b
Changeset

Merge branch 'master' into develop

Conflicts:
.travis.yml
application/config/version.php
application/controllers/admin/questions.php
application/helpers/export_helper.php
application/helpers/expressions/em_manager_helper.php
application/views/admin/survey/Question/editQuestion_view.php
application/views/admin/survey/surveySummary_view.php
mod - .travis.yml Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
add - application/core/LSYii_ImageValidator.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/AssetVersion.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/super/_tutorial_menu.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/importQuestion_view.php Diff File
mod - application/views/admin/survey/Question/import_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item.twig Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.debug.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/src/components/sidebar.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_questionsgroups.vue Diff File
mod - assets/packages/adminpanel/src/store/vuex-store.js Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/scripts/admin/questions.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/fr/fr.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/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/pt-BR/pt-BR.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File
mod - themes/admin/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - themes/admin/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - themes/admin/Black_Pearl/css/lime-admin-colors.css Diff File
mod - themes/admin/Dark_Sky/css/lime-admin-colors.css Diff File
mod - themes/admin/Free_Magenta/css/lime-admin-colors.css Diff File
mod - themes/admin/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - themes/admin/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - themes/survey/bootswatch/config.xml Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
add - themes/survey/bootswatch/scripts/index.html Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/options/options.twig Diff File
add - themes/survey/fruity/scripts/sticky.min.js Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.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/theme.js Diff File
mod - themes/survey/vanilla/views/layout_global.twig Diff File
mod - themes/survey/vanilla/views/layout_survey_list.twig Diff File
mod - themes/survey/vanilla/views/subviews/header/head.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/warnings.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/welcome.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer_first_page.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer_top_menu.twig Diff File
mod - themes/survey/vanilla/views/subviews/privacy/privacy.twig Diff File
mod - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig Diff File