LimeSurvey: master b3e4d3b7

Diff Back to Repository
Author Committer Branch Timestamp Parent
pstelling pstelling master 2021-03-15 09:35:39 master 488656e2
Changeset

Merge remote-tracking branch 'origin/master' into task/zoho-L41-T491-checkbox-layout-not_shown-in-overview

Conflicts:

application/views/questionAdministration/summary.php
mod - application/config/version.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/core/QuestionTypes/ArrayMultiscale/RenderArrayMultiscale.php Diff File
mod - application/datavalueobjects/SimpleSurveyValues.php Diff File
mod - application/extensions/GeneralOptionWidget/GeneralOptionWidget.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/twig_translation_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/services/CreateSurvey.php Diff File
mod - application/views/questionAdministration/summary.php Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - assets/packages/adminsidepanel/build.min/css/adminsidepanel.css Diff File
mod - assets/packages/adminsidepanel/build.min/css/adminsidepanel.rtl.css Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js.map Diff File
mod - assets/packages/adminsidepanel/build/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/lib/surveysettings.js Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/fi/fi.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/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - tests/unit/models/CreateSurveyServiceTest.php Diff File