LimeSurvey: master 9e2fa140

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2023-11-17 10:09:43 master bfceadbe
Changeset

Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/helpers/update/updates/Update_617.php

application/views/themeOptions/options_core.php
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/UserManagementController.php Diff File
mod - application/controllers/admin/Database.php Diff File
mod - application/controllers/admin/ParticipantsAction.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/update/updates/Update_400.php Diff File
mod - application/helpers/update/updates/Update_617.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveysGroupsettings.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/services/SurveyUpdater/GeneralSettings.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/modal_subviews/_exportCSV.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/uploadSummary_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/themeOptions/options_core.php Diff File
mod - assets/admin_themes/adminbasics_temporary/000-lime-admin-common.scss Diff File
mod - assets/admin_themes/adminbasics_temporary/003-attributeMapToken.scss Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.rtl.css Diff File
mod - assets/packages/themeoptions-core/themeoptions-core.js Diff File
mod - assets/scripts/admin/attributeMap.js Diff File
mod - assets/scripts/admin/attributeMapCSV.js Diff File
mod - assets/scripts/admin/participantpanel.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/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.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/pl-informal/pl-informal.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/TestHelper.php Diff File
mod - tests/functional/frontend/ShortUrlTest.php Diff File
mod - tests/unit/CsrfHttpRequestTest.php Diff File
mod - tests/unit/helpers/ParticipantBlacklistHandlerTest.php Diff File
mod - tests/unit/models/SurveyInheritanceMechanismTest.php Diff File
mod - tests/unit/services/SurveyUpdater/GeneralSettings/GeneralSettingsExceptionsTest.php Diff File
mod - tests/unit/services/SurveyUpdater/GeneralSettings/GeneralSettingsFactory.php Diff File
mod - tests/unit/services/SurveyUpdater/GeneralSettings/GeneralSettingsMockSet.php Diff File
mod - tests/unit/services/SurveyUpdater/GeneralSettings/GeneralSettingsMockSetFactory.php Diff File
mod - tests/unit/services/SurveyUpdater/GeneralSettings/GeneralSettingsUpdateOwnerTest.php Diff File
mod - themes/admin/Sea_Green/css/sea_green-rtl.css Diff File
mod - themes/admin/Sea_Green/css/sea_green-rtl.min.css Diff File
mod - themes/admin/Sea_Green/css/sea_green.css Diff File
mod - themes/admin/Sea_Green/css/sea_green.min.css Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/assets/scripts/advanced_ranking.js Diff File
add - themes/survey/bootswatch/css/variations/README.txt Diff File
mod - themes/survey/bootswatch/css/variations/cosmos.min.css Diff File
mod - themes/survey/bootswatch/css/variations/cyborg.min.css Diff File
mod - themes/survey/bootswatch/css/variations/darkly.min.css Diff File
mod - themes/survey/bootswatch/css/variations/flatly.min.css Diff File
mod - themes/survey/bootswatch/css/variations/journal.min.css Diff File
mod - themes/survey/bootswatch/css/variations/lumen.min.css Diff File
mod - themes/survey/bootswatch/css/variations/paper.min.css Diff File
mod - themes/survey/bootswatch/css/variations/readable.min.css Diff File
mod - themes/survey/bootswatch/css/variations/sandstone.min.css Diff File
mod - themes/survey/bootswatch/css/variations/simplex.min.css Diff File
mod - themes/survey/bootswatch/css/variations/spacelab.min.css Diff File
mod - themes/survey/bootswatch/css/variations/superhero.min.css Diff File
mod - themes/survey/bootswatch/css/variations/yeti.min.css Diff File