LimeSurvey: master 3fa6711b

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2021-09-14 12:57:01 master 15ced1b0
Changeset

Merge branch 'master' into bug/16995-YII_CSRF_TOKEN-shown-in-url
mod - .github/workflows/main.yml Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/updater_version.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/HomepageSettingsController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.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/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSSodium.php Diff File
mod - application/core/LSSodiumOld.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/db/DbConnection.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/ExportSPSSsav/SPSSWriter.php Diff File
mod - application/core/plugins/ExportSPSSsav/config.xml Diff File
mod - application/core/plugins/TwoFactorAdminLogin/models/TFAUser.php Diff File
mod - application/core/plugins/TwoFactorAdminLogin/models/TFAUserKey.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/QuestionThemeGeneralOption.php Diff File
mod - application/extensions/TopbarWidget/views/includes/conditionDesignerTopbarRight_view.php Diff File
add - application/extensions/TopbarWidget/views/includes/editGroupToolsDropdownItems.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editGroupTopbarLeft_view.php Diff File
add - application/extensions/TopbarWidget/views/includes/groupToolsDropdownItems.php Diff File
mod - application/extensions/TopbarWidget/views/includes/groupTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/groupTopbarRight_view.php Diff File
add - application/extensions/TopbarWidget/views/includes/questionToolsDropdownItems.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/responseViewTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/surveyTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/questionTopbar_view.php Diff File
mod - application/extensions/UserPermissionsWidget/views/table.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_expiry_dialog.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/WhFineUploader.php Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/assets/css/fineuploader.css Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/assets/img/loading.gif Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/assets/img/processing.gif Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/assets/js/jquery.fineuploader-3.2.js Diff File
rm - application/extensions/yiiwheels/widgets/fineuploader/assets/js/jquery.fineuploader-3.2.min.js Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/exportresults_helper.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/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_core_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/ldap_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/twig_translation_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Box.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/LabelSet.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Permissiontemplates.php Diff File
mod - application/models/Plugin.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionBaseDataSet.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
mod - application/models/QuestionCreate.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/SavedControl.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyTimingDynamic.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/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/services/PasswordManagement.php Diff File
mod - application/models/services/PermissionManager.php Diff File
mod - application/models/services/ThemeQuestionAttributeProvider.php Diff File
mod - application/views/SurveysGroupsPermission/subviews/currentUsersList.php Diff File
mod - application/views/admin/authentication/ajaxLogin.php Diff File
mod - application/views/admin/conditions/includes/navigator.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/generatestats/_header.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/statistics_browse_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_statistics_header.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/expressions/test/functions.php Diff File
mod - application/views/admin/globalsettings/_overview.php Diff File
mod - application/views/admin/globalsettings/_storage_ajax.php Diff File
mod - application/views/admin/labels/_labelviewtabcontent_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/labels/labelview_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/massive_actions/_selector.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_share.php Diff File
mod - application/views/admin/participants/modal_subviews/_showParticipantSurveys.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/participants/viewAttribute_view.php Diff File
mod - application/views/admin/permissiontemplates/index.php Diff File
mod - application/views/admin/permissiontemplates/massiveAction/_selector.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/responses/browseallrow_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/responses/browsetimerow_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/admin_notifications.php Diff File
rm - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_selector.php Diff File
mod - application/views/admin/survey/subview/accordion/_integration_panel.php Diff File
mod - application/views/admin/survey/surveybar_tools.php Diff File
mod - application/views/admin/surveymenu/index.php Diff File
mod - application/views/admin/surveymenu/massive_action/_selector.php Diff File
mod - application/views/admin/surveymenu/shortlist.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/surveymenu_entries/massive_action/_selector.php Diff File
mod - application/views/admin/surveymenu_entries/shortlist.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/tutorialentries/index.php Diff File
mod - application/views/admin/tutorials/index.php Diff File
mod - application/views/admin/update/manage/manage_key.php Diff File
mod - application/views/assessment/assessments_view.php Diff File
mod - application/views/homepageSettings/index.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/questionAdministration/answerOptions.twig Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/listquestions.php Diff File
mod - application/views/questionAdministration/subquestions.twig Diff File
mod - application/views/questionAdministration/summary.php Diff File
mod - application/views/questionAdministration/typeSelector.php Diff File
mod - application/views/questionGroupsAdministration/listquestiongroups.php Diff File
mod - application/views/survey/questions/answer/5pointchoice/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/10point/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/5point/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/array/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/column/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/increasesamedecrease/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/multiflexi/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/texts/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/yesnouncertain/config.xml Diff File
mod - application/views/survey/questions/answer/boilerplate/config.xml Diff File
mod - application/views/survey/questions/answer/date/config.xml Diff File
mod - application/views/survey/questions/answer/equation/config.xml Diff File
mod - application/views/survey/questions/answer/file_upload/config.xml Diff File
mod - application/views/survey/questions/answer/gender/config.xml Diff File
mod - application/views/survey/questions/answer/hugefreetext/config.xml Diff File
mod - application/views/survey/questions/answer/language/config.xml Diff File
mod - application/views/survey/questions/answer/list_dropdown/config.xml Diff File
mod - application/views/survey/questions/answer/list_with_comment/config.xml Diff File
mod - application/views/survey/questions/answer/listradio/config.xml Diff File
mod - application/views/survey/questions/answer/longfreetext/config.xml Diff File
mod - application/views/survey/questions/answer/multiplechoice/config.xml Diff File
mod - application/views/survey/questions/answer/multiplechoice_with_comments/config.xml Diff File
mod - application/views/survey/questions/answer/multiplenumeric/config.xml Diff File
mod - application/views/survey/questions/answer/multipleshorttext/config.xml Diff File
mod - application/views/survey/questions/answer/numerical/config.xml Diff File
mod - application/views/survey/questions/answer/shortfreetext/config.xml Diff File
mod - application/views/survey/questions/answer/yesno/config.xml Diff File
mod - application/views/surveyAdministration/activateSurvey_view.php Diff File
mod - application/views/surveyAdministration/listSurveys_view.php Diff File
mod - application/views/themeOptions/index.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/massiveAction/_selector.php Diff File
mod - application/views/userManagement/partial/_menubar.php Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js 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/coverage/lcov-report/src/components/confirmdeletemodal.js.html Diff File
mod - assets/packages/adminbasics/scss/000-lime-admin-common.scss Diff File
mod - assets/packages/adminbasics/scss/grid.scss Diff File
mod - assets/packages/adminbasics/scss/ltr/000-lime-admin-common.scss Diff File
mod - assets/packages/adminbasics/scss/rtl/000-lime-admin-common-rtl.scss Diff File
mod - assets/packages/adminbasics/src/components/confirmdeletemodal.js Diff File
mod - assets/packages/adminbasics/yarn.lock Diff File
mod - assets/packages/ckeditor/CHANGES.md Diff File
mod - assets/packages/ckeditor/LICENSE.md Diff File
add - assets/packages/ckeditor/bender-runner.config.json Diff File
mod - assets/packages/ckeditor/ckeditor.js Diff File
mod - assets/packages/ckeditor/lang/cs.js Diff File
mod - assets/packages/ckeditor/lang/de-ch.js Diff File
mod - assets/packages/ckeditor/lang/de.js Diff File
mod - assets/packages/ckeditor/lang/es.js Diff File
mod - assets/packages/ckeditor/lang/fr.js Diff File
mod - assets/packages/ckeditor/lang/gl.js Diff File
mod - assets/packages/ckeditor/lang/hu.js Diff File
mod - assets/packages/ckeditor/lang/it.js Diff File
mod - assets/packages/ckeditor/lang/lv.js Diff File
mod - assets/packages/ckeditor/lang/nl.js Diff File
mod - assets/packages/ckeditor/lang/sr-latn.js Diff File
mod - assets/packages/ckeditor/lang/sr.js Diff File
mod - assets/packages/ckeditor/lang/sv.js Diff File
mod - assets/packages/ckeditor/lang/zh.js Diff File
mod - assets/packages/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js Diff File
mod - assets/packages/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js Diff File
mod - assets/packages/ckeditor/plugins/link/dialogs/anchor.js Diff File
mod - assets/packages/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js Diff File
mod - assets/packages/ckeditor/plugins/wsc/README.md Diff File
mod - assets/packages/ckeditor/plugins/wsc/dialogs/wsc.js Diff File
mod - assets/packages/ckeditor/plugins/wsc/dialogs/wsc_ie.js Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor.css Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor_gecko.css Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor_ie.css Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor_ie7.css Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor_ie8.css Diff File
mod - assets/packages/ckeditor/skins/bootstrapck/editor_iequirks.css Diff File
mod - assets/packages/lslog/yarn.lock Diff File
mod - assets/packages/lstutorial/yarn.lock Diff File
mod - assets/packages/permissionroles/js/permissionroles.js Diff File
mod - assets/packages/surveymenufunctions/surveymenuentryfunctions.min.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.min.js Diff File
mod - assets/scripts/admin/globalsettings.js Diff File
mod - assets/scripts/admin/questionEditor.js Diff File
mod - assets/scripts/admin/surveysettings.js Diff File
mod - assets/styles-public/browse.css Diff File
mod - docs/release_notes.txt Diff File
mod - docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
add - locale/ceb/ceb.mo Diff File
add - locale/ceb/index.html Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fi/fi.mo Diff File
add - locale/hil/hil.mo Diff File
add - locale/hil/index.html Diff File
add - locale/ilo/ilo.mo Diff File
add - locale/ilo/index.html 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
add - locale/xho/index.html Diff File
add - locale/xho/xho.mo Diff File
mod - modules/admin/globalsettings/views/_overview.php Diff File
mod - psalm.xml Diff File
add - tests/data/surveys/limesurvey_survey_HtmlInTimerMessages.lss Diff File
add - tests/data/surveys/limesurvey_survey_OldCodes.lss Diff File
mod - tests/functional/backend/QuestionAttributeTest.php Diff File
mod - tests/functional/backend/QuestionGroupEditorTest.php Diff File
add - tests/functional/frontend/TimerMessagesEscapingTest.php Diff File
mod - tests/phpstan/phpstan_bootstrap.php Diff File
add - tests/unit/helpers/OldCodesReplacementTest.php Diff File
add - tests/unit/models/QuestionTest.php Diff File
mod - themes/question/image_select/survey/questions/answer/listradio/config.xml Diff File