LimeSurvey: master 2cf312e6

Author Committer Branch Timestamp Parent
ollehar ollehar master 2021-04-06 15:34 master 9c6411ca
Changeset

Merge branch 'master' into develop

mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/LimereplacementfieldsController.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/QuestionGroupsAdministrationController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/SurveysGroupsPermissionController.php Diff File
mod - application/controllers/ThemeOptionsController.php Diff File
mod - application/controllers/UserGroupController.php Diff File
mod - application/controllers/UserManagementController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/QuestionTypes/ArrayFlexibleRow/RenderArrayFlexibleRow.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/models/TFAUser.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/models/TFAUserKey.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/views/index.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/views/userindex.php Diff File
mod - application/core/plugins/expressionFixedDbVar/expressionFixedDbVar.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/twig_translation_helper.php Diff File
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/Permissiontemplates.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuestionGroupL10n.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/SurveysInGroup.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/currentUsersList.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/deleteUserResult.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/setPermissionForm.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/viewCurrents.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/globalsettings/_bounce.php Diff File
mod - application/views/admin/globalsettings/_email.php Diff File
mod - application/views/admin/globalsettings/_storage.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_tokens_panel.php Diff File
mod - application/views/admin/survey/topbar/responses_topbar.php Diff File
mod - application/views/admin/surveysgroups/_form.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/assessment/assessments_view.php Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/textElements.php Diff File
mod - application/views/survey/frontpage/captchaForm/form.php Diff File
mod - application/views/survey/frontpage/registerForm/form.php Diff File
mod - application/views/survey/frontpage/tokenForm/form.php Diff File
mod - application/views/survey/questions/answer/shortfreetext/config.xml Diff File
mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item_100.twig Diff File
mod - application/views/survey/system/formItem/captcha.php Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - assets/packages/lstutorial/yarn.lock Diff File
mod - assets/packages/questions/timer/yarn.lock Diff File
mod - assets/packages/usermanagement/js/usermanagement.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/bg.mo 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/fi/fi.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/mn/mn.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl-informal/pl-informal.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/pt/pt.mo Diff File
mod - tests/unit/helpers/RemoteControlListParticipantsTest.php Diff File
add - themes/admin/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Black_Pearl/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Dark_Sky/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Free_Magenta/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - themes/admin/Sunset_Orange/css/lime-admin-colors.css Diff File
add - themes/admin/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File