LimeSurvey: master 0c5f8dcc

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2023-07-07 16:36 master ca39cd2d
Changeset

Merge branch 'master' into ls6_surveytheme

Conflicts:

application/config/version.php

themes/admin/Sea_Green/css/sea_green-rtl.min.css

themes/admin/Sea_Green/css/sea_green.min.css
mod - application/config/version.php Diff File
mod - application/controllers/QuickTranslationController.php Diff File
mod - application/controllers/SurveyPermissionsController.php Diff File
mod - application/controllers/SurveysGroupsPermissionController.php Diff File
mod - application/controllers/UserGroupController.php Diff File
mod - application/controllers/UserManagementController.php Diff File
mod - application/controllers/admin/DataEntry.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php Diff File
mod - application/extensions/admin/grid/GridActionsWidget/views/action_dropdown.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/helpers/admin/label_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/services/SurveyPermissions.php Diff File
mod - application/views/admin/labels/labelRow.twig Diff File
mod - application/views/admin/super/admin_notifications.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/subview/surveydashboard/001-sharingpanel.twig Diff File
mod - application/views/admin/survey/subview/surveydashboard/002-surveytextpanel.twig Diff File
mod - application/views/admin/survey/subview/surveydashboard/003-publicationpanel.twig Diff File
mod - application/views/admin/survey/subview/surveydashboard/004-generalsettingspanel.twig Diff File
mod - application/views/quickTranslation/translateFieldData.php Diff File
mod - application/views/quickTranslation/translateformheader_view.php Diff File
mod - application/views/quickTranslation/translatetabs_view.php Diff File
mod - application/views/surveyAdministration/surveySummary_view.php Diff File
mod - application/views/surveyPermissions/index.php Diff File
mod - application/views/surveyPermissions/settingsPermission.php Diff File
mod - application/views/userManagement/massiveAction/_selector.php Diff File
add - assets/admin_themes/Sea_Green/card/ls-card-grid.scss Diff File
mod - assets/admin_themes/Sea_Green/lime-admin-colors.scss Diff File
add - assets/admin_themes/Sea_Green/list_group/list_group.scss Diff File
mod - assets/admin_themes/Sea_Green/sea_green.scss 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/notifications.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/th/th.mo Diff File
add - tests/data/surveys/survey_GetQuestionTest.lss Diff File
mod - tests/unit/LSYiiValidatorsTest.php Diff File
mod - tests/unit/models/PermissionTest.php Diff File
mod - tests/unit/models/SurveyPermissionsServiceTest.php Diff File
mod - tests/unit/models/SurveyTest.php Diff File
add - tests/unit/models/UserManagerServiceTest.php Diff File
add - tests/unit/plugins/LimesurveyApi/GetQuestionsTest.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