LimeSurvey: master 0ff4d15a

Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2023-07-13 17:39 master 569b041e
Changeset

Merge branch 'master' into ls6_surveytheme

Conflicts:

application/config/version.php

mod - application/config/version.php Diff File
mod - application/controllers/FailedEmailController.php Diff File
mod - application/controllers/UserGroupController.php Diff File
mod - application/controllers/UserManagementController.php Diff File
mod - application/controllers/UserRoleController.php Diff File
mod - application/extensions/admin/grid/CLSGridView.php Diff File
mod - application/extensions/admin/grid/GridActionsWidget/assets/action_dropdown.js Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/layouts/adminmenu.php Diff File
mod - application/views/surveyAdministration/editLocalSettings_main_view.php Diff File
mod - assets/admin_themes/Sea_Green/tables/tables.scss Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca-valencia/ca-valencia.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/sk/sk.mo Diff File
mod - locale/th/th.mo Diff File
mod - tests/unit/helpers/remotecontrol/ExportStatisticsTest.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