LimeSurvey: master bacb65b9

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2021-07-23 11:24 master cec44e37
Changeset

Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/helpers/update/updatedb_helper.php
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/core/LSSodium.php Diff File
add - application/core/LSSodiumOld.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/surveymenu/index.php Diff File
mod - application/views/admin/surveysgroups/_form.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/surveyAdministration/activateSurvey_view.php Diff File
mod - application/views/surveyAdministration/listSurveys_view.php Diff File
rm - assets/styles-public/lime-progress.css Diff
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/subviews/content/firstpage.twig Diff File
mod - themes/survey/vanilla/views/subviews/header/progress_bar.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/warnings.twig Diff File
mod - themes/survey/vanilla/views/subviews/privacy/allinone_mode_welcome_privacy.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
mod - themes/survey/vanilla/views/subviews/privacy/privacy_text.twig Diff File