LimeSurvey: master a7d8459a

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2021-08-04 16:31 master debe5fd9
Changeset

Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/helpers/update/updatedb_helper.php
mod - README.md Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/QuestionAdministrationController.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/participantsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/TopbarWidget/views/baseTopbar_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/surveyTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/tokensTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/questionTopbar_view.php Diff File
mod - application/helpers/LayoutHelper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/third_party/phpmailer/README.md Diff File
mod - application/third_party/phpmailer/SECURITY.md Diff File
mod - application/third_party/phpmailer/VERSION Diff File
mod - application/third_party/phpmailer/composer.json Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ar.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-az.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ba.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-be.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-bg.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ca.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ch.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-cs.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-da.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-de.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-el.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-eo.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-es.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-et.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fa.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fi.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fo.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-fr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-gl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-he.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-hi.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-hr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-hu.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-id.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-it.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ja.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ko.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-lt.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-lv.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-mg.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ms.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-nb.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-nl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pt.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pt_br.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ro.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ru.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sk.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-sv.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-tl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-tr.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-uk.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-vi.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-zh.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-zh_cn.php Diff File
mod - application/third_party/phpmailer/src/Exception.php Diff File
mod - application/third_party/phpmailer/src/OAuth.php Diff File
mod - application/third_party/phpmailer/src/PHPMailer.php Diff File
mod - application/third_party/phpmailer/src/POP3.php Diff File
mod - application/third_party/phpmailer/src/SMTP.php Diff File
mod - application/views/admin/databaseupdate/verify.php Diff File
mod - application/views/admin/export/generatestats/_header.php Diff File
mod - application/views/admin/globalsettings/_email.php Diff File
mod - application/views/admin/labels/exportmulti_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/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/scanFilesResult.php Diff File
rm - application/views/admin/responses/browseallheader_view.php Diff
mod - application/views/admin/super/fullpagebar_view.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/surveySettings.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/homepageSettings/index.php Diff File
mod - application/views/homepageSettings/update.php Diff File
mod - application/views/layouts/fullpagebar_view.php Diff File
mod - application/views/questionAdministration/modals.twig Diff File
mod - application/views/questionAdministration/topbars/editQuestiontopbar_view.php Diff File
mod - application/views/questionGroupsAdministration/questiongroupbar_view.php 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/hugefreetext/config.xml Diff File
mod - application/views/survey/questions/answer/list_dropdown/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/shortfreetext/config.xml Diff File
mod - application/views/surveyAdministration/newSurvey_view.php Diff File
mod - application/views/themeOptions/update.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/massiveAction/_selector.php Diff File
mod - application/views/userManagement/partial/_menubar.php Diff File
mod - application/views/userManagement/partial/createdrandoms.php Diff File
mod - application/views/userManagement/partial/edittemplatepermissions.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/adminsidepanel/build.min/css/adminsidepanel.css Diff File
mod - assets/packages/adminsidepanel/build.min/css/adminsidepanel.rtl.css Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/build/css/adminsidepanel.css Diff File
mod - assets/packages/adminsidepanel/build/css/adminsidepanel.rtl.css Diff File
mod - assets/packages/adminsidepanel/build/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/scss/custom.scss Diff File
mod - assets/packages/adminsidepanel/src/components/sidebar.vue Diff File
mod - assets/packages/usermanagement/js/usermanagement.js Diff File
mod - assets/scripts/admin/questionEditor.js Diff File
add - assets/scripts/admin/topbar.js Diff File
mod - docs/release_notes.txt Diff File
mod - docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml 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/de.mo Diff File
mod - locale/fi/fi.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/ja/ja.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 - tests/functional/backend/QuestionGroupEditorTest.php Diff File
mod - themes/admin/Apple_Blossom/css/lime-admin-colors.css Diff File
mod - themes/admin/Bay_of_Many/css/lime-admin-colors.css Diff File
mod - themes/admin/Black_Pearl/css/lime-admin-colors.css Diff File
mod - themes/admin/Dark_Sky/css/lime-admin-colors.css Diff File
mod - themes/admin/Free_Magenta/css/lime-admin-colors.css Diff File
mod - themes/admin/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - themes/admin/Purple_Tentacle/css/lime-admin-colors.css Diff File
mod - themes/admin/Sea_Green/css/lime-admin-colors.css Diff File
mod - themes/admin/Sunset_Orange/css/lime-admin-colors.css Diff File
mod - themes/survey/bootswatch/config.xml Diff File