LimeSurvey: master 0b9c49db

Diff Back to Repository
Author Committer Branch Timestamp Parent
pstelling pstelling master 2021-06-17 12:33:29 master aa786d00
Changeset

Merge remote-tracking branch 'origin/master' into task/zoho-L41-T742-modals-ui-changes-one-commit

Conflicts:

application/views/themeOptions/index.php

application/views/userManagement/partial/addrole.php

assets/packages/adminbasics/build/adminbasics.css

assets/packages/adminbasics/build/adminbasics.min.css

assets/packages/adminbasics/build/adminbasics.rtl.css

assets/packages/adminbasics/build/adminbasics.rtl.min.css
mod - .travis.yml Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/HomepageSettingsController.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/RegisterController.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/PermissiontemplatesController.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveymenuEntryController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSSodium.php Diff File
mod - application/core/QuestionTypes/Date/RenderDate.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/AdvancedSettingWidget/views/layout.php Diff File
mod - application/extensions/GeneralOptionWidget/views/layout.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editGroupTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/groupTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarLeft_view.php Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.js Diff File
mod - application/helpers/LayoutHelper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
add - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionInstaller.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionUpdater.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionUpdaterServiceLocator.php Diff File
mod - application/libraries/ExtensionInstaller/FileFetcher.php Diff File
mod - application/libraries/ExtensionInstaller/FileFetcherUploadZip.php Diff File
mod - application/libraries/ExtensionInstaller/GitVersionFetcher.php Diff File
mod - application/libraries/ExtensionInstaller/PluginInstaller.php Diff File
mod - application/libraries/ExtensionInstaller/PluginUpdater.php Diff File
add - application/libraries/ExtensionInstaller/QuestionThemeInstaller.php Diff File
mod - application/libraries/ExtensionInstaller/ThemeUpdater.php Diff File
mod - application/libraries/ExtensionInstaller/VersionFetcher.php Diff File
mod - application/libraries/ExtensionInstaller/VersionFetcherServiceLocator.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/ExtensionConfig.php Diff File
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/views/SurveysGroupsPermission/index.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/globalsettings/_general.php Diff File
mod - application/views/admin/globalsettings/surveySettings.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/labels/labelsets_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/summary_view.php Diff File
mod - application/views/admin/permissiontemplates/index.php Diff File
mod - application/views/admin/permissiontemplates/partials/_menubar.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/pluginmanager/scanFilesResult.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/layout_main.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_publication_panel.php Diff File
mod - application/views/admin/surveymenu/index.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/surveysgroups/create.php Diff File
mod - application/views/admin/surveysgroups/surveySettings.php Diff File
mod - application/views/admin/surveysgroups/update.php Diff File
mod - application/views/admin/themes/importuploaded_view.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/homepageSettings/_form.php Diff File
mod - application/views/homepageSettings/create.php Diff File
mod - application/views/homepageSettings/index.php Diff File
mod - application/views/homepageSettings/update.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/layouts/main.php Diff File
add - application/views/layouts/surveymanagerbar.php Diff File
mod - application/views/questionAdministration/advancedSettings.php Diff File
mod - application/views/questionAdministration/answerOptionRow.twig Diff File
mod - application/views/questionAdministration/answerOptions.twig Diff File
mod - application/views/questionAdministration/create.php Diff File
add - application/views/questionAdministration/extraOptions.php Diff File
mod - application/views/questionAdministration/generalSettings.php Diff File
mod - application/views/questionAdministration/languageselector.php Diff File
add - application/views/questionAdministration/questionCode.php Diff File
add - application/views/questionAdministration/questionSummary.php Diff File
mod - application/views/questionAdministration/subquestionRow.twig Diff File
mod - application/views/questionAdministration/subquestions.twig Diff File
mod - application/views/questionAdministration/summary.php Diff File
mod - application/views/questionAdministration/textElements.php Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig Diff File
mod - application/views/surveyAdministration/listSurveys_view.php Diff File
mod - application/views/surveyAdministration/newSurvey_view.php Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - application/views/themeOptions/availablethemelist.php Diff File
mod - application/views/themeOptions/index.php Diff File
mod - application/views/themeOptions/update.php Diff File
mod - application/views/userGroup/addUserGroup_view.php Diff File
mod - application/views/userGroup/editUserGroup_view.php Diff File
mod - application/views/userGroup/mailUserGroup_view.php Diff File
mod - application/views/userGroup/usergroupbar_view.php Diff File
mod - application/views/userGroup/usergroups_view.php Diff File
mod - application/views/userGroup/viewUserGroup_view.php Diff File
mod - application/views/userManagement/index.php Diff File
mod - application/views/userManagement/partial/_menubar.php Diff File
mod - application/views/userManagement/partial/addrole.php Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.rtl.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.rtl.min.css Diff File
mod - assets/packages/adminbasics/scss/000-lime-admin-common.scss Diff File
mod - assets/packages/adminbasics/yarn.lock Diff File
mod - assets/packages/ckeditor/config.js Diff File
add - assets/packages/ckeditor/plugins/editorplaceholder/plugin.js Diff File
add - assets/packages/ckeditor/plugins/lsswitchtoolbars/basic.gif Diff File
add - assets/packages/ckeditor/plugins/lsswitchtoolbars/full.gif Diff File
add - assets/packages/ckeditor/plugins/lsswitchtoolbars/plugin.js Diff File
mod - assets/scripts/admin/questionEditor.js Diff File
mod - composer.json Diff File
mod - docs/release_notes.txt Diff File
mod - index.php Diff File
mod - installer/create-database.php 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/de-easy/de-easy.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/fr/fr.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 - locale/tr/tr.mo Diff File
mod - modules/admin/globalsettings/views/globalSettings_view.php Diff File
mod - psalm.xml Diff File
mod - tests/LimeSurveyWebDriver.php Diff File
mod - tests/README.md Diff File
add - tests/data/file_upload/rangeslider_tpartner.zip Diff File
add - tests/data/surveys/limesurvey_survey_193959_testSelectQuestionThemeInEditor.lss Diff File
add - tests/data/surveys/survey_archive_222923_executeQuestionThemeSurvey.lsa Diff File
mod - tests/functional/acceptance/15997-ip-anonymize/IpAddressAnonymizeTest.php Diff File
add - tests/functional/backend/QuestionThemeTest.php Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml Diff File
mod - themes/survey/vanilla/views/layout_errors.twig Diff File
mod - third_party/kcfinder/core/bootstrap.php Diff File