LimeSurvey: master 8a0c72e0

Author Committer Branch Timestamp Parent
pstelling pstelling master 2021-04-23 09:41:49 master b9cc063b
Changeset

Merge remote-tracking branch 'origin/master' into task/zoho-L41-T309-email-plain-password

Conflicts:

application/config/version.php

application/core/LsDefaultDataSets.php

application/helpers/update/updatedb_helper.php

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/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/ExpressionValidate.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.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/responses.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/core/LSFileHelper.php Diff File
mod - application/core/LSUserIdentity.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/QuestionTypes/Date/RenderDate.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/.gitignore Diff File
add - application/core/plugins/TwoFactorAdminLogin/TwoFactorAdminLogin.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/assets/tfaScripts.js Diff File
add - application/core/plugins/TwoFactorAdminLogin/assets/tfaStyles.css Diff File
add - application/core/plugins/TwoFactorAdminLogin/composer.json Diff File
add - application/core/plugins/TwoFactorAdminLogin/config.xml Diff File
add - application/core/plugins/TwoFactorAdminLogin/helper/TFAHelper.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/helper/TFAMenuClass.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/helper/TFAQrCodeGenerator.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/helper/phpqrcode.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/index.html Diff File
add - application/core/plugins/TwoFactorAdminLogin/installer/TFAPluginInstaller.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/models/TFAUser.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/models/TFAUserKey.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/autoload.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/ClassLoader.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/InstalledVersions.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/LICENSE Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/autoload_classmap.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/autoload_namespaces.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/autoload_psr4.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/autoload_real.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/autoload_static.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/installed.json Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/installed.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/composer/platform_check.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/.gitignore Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/.travis.yml Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/LICENSE Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/README.md Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/TwoFactorAuth.phpproj Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/TwoFactorAuth.sln Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/composer.json Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/demo/demo.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/demo/loader.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/QRException.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/QRServerProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Qr/QRicketProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/CSRNGProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/HashRNGProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/OpenSSLRNGProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Rng/RNGException.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Time/HttpTimeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Time/ITimeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Time/LocalMachineTimeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Time/NTPTimeProvider.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/Providers/Time/TimeException.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/TwoFactorAuth.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/logo.png Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/multifactorauthforeveryone.png Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/phpunit.xml Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/phpunit.xml.tmppica Diff File
add - application/core/plugins/TwoFactorAdminLogin/vendor/robthree/twofactorauth/tests/TwoFactorAuthTest.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/views/_partial/create.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/views/_partial/error.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/views/_partial/unset.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/views/index.php Diff File
add - application/core/plugins/TwoFactorAdminLogin/views/userindex.php Diff File
mod - application/core/plugins/expressionFixedDbVar/config.xml Diff File
mod - application/core/plugins/expressionFixedDbVar/expressionFixedDbVar.php Diff File
mod - application/core/plugins/expressionQuestionForAll/config.xml Diff File
add - application/core/utils/fileExtensions.php Diff File
mod - application/extensions/GeneralOptionWidget/GeneralOptionWidget.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/RelevanceEquationGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/views/text.php Diff File
mod - application/extensions/TopbarWidget/views/includes/addGroupTopbarRight_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editGroupTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/questionTopbarRight_view.php Diff File
mod - application/extensions/bootstrap/components/TbApi.php Diff File
rm - application/extensions/bootstrap/js/bootstrap.js Diff File
rm - application/extensions/bootstrap/js/bootstrap.min.js Diff File
mod - application/helpers/SurveyRuntimeHelper.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/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/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/twig_translation_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
rm - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
rm - application/libraries/PluginManager/Question/QuestionBase.php Diff File
rm - application/libraries/PluginManager/Question/QuestionPluginAbstract.php Diff File
rm - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
rm - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Participant.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/QuestionGroup.php Diff File
mod - application/models/QuestionGroupL10n.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/Survey.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/SurveysGroupsettings.php Diff File
mod - application/models/SurveysInGroup.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
add - application/models/services/QuestionAttributeHelper.php Diff File
add - application/models/services/README.md Diff File
add - application/models/services/SurveyIntegrity.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/checkintegrity/check_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/globalsettings/_bounce.php Diff File
mod - application/views/admin/globalsettings/_email.php Diff File
add - application/views/admin/globalsettings/_emailTestConfirmation.php Diff File
add - application/views/admin/globalsettings/_emailTestResults.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/pluginmanager/index.php Diff File
mod - application/views/admin/super/layout_insurvey.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/_presentation_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_tokens_panel.php Diff File
mod - application/views/admin/survey/surveybar_rightactionbuttons.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/themes/importuploaded_view.php Diff File
mod - application/views/admin/themes/templatesummary_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/assessment/assessments_view.php Diff File
mod - application/views/questionAdministration/answerOptionRow.twig Diff File
mod - application/views/questionAdministration/codeAndType.php Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/languageselector.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/deactivateSurvey_view.php Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - application/views/userGroup/usergroupbar_view.php Diff File
mod - application/views/userManagement/partial/editpermissions.php Diff File
mod - assets/fonts/noto.css 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.min.js Diff File
rm - assets/packages/adminbasics/build/adminbasics.min.js.map 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/rollup.config.js 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
rm - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js.map 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/vue.config.js Diff File
mod - assets/packages/bootstrap/bootstrap.min.css Diff File
mod - assets/packages/expressions/em_javascript.js Diff File
mod - assets/packages/lstutorial/build/lstutorial.js Diff File
mod - assets/packages/lstutorial/build/lstutorial.min.js Diff File
rm - assets/packages/lstutorial/build/lstutorial.min.js.map Diff File
mod - assets/packages/lstutorial/rollup.config.js Diff File
mod - assets/packages/lstutorial/yarn.lock Diff File
mod - assets/packages/pjax/pjax.js Diff File
mod - assets/packages/questions/timer/yarn.lock Diff File
mod - assets/packages/usermanagement/js/usermanagement.js Diff File
mod - assets/scripts/admin/globalsettings.js Diff File
mod - assets/scripts/admin/questionEditor.js Diff File
mod - docs/release_notes.txt Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/bg.mo 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/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/it/it.mo Diff File
mod - locale/ja/ja.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 - locale/tg/tg.mo Diff File
mod - modules/admin/globalsettings/README.md Diff File
add - tests/data/plugins/NewQuestionAttributesPlugin.php Diff File
add - tests/functional/backend/QuestionAttributeTest.php Diff File
mod - tests/unit/helpers/RemoteControlListParticipantsTest.php Diff File
add - tests/unit/helpers/RemoteControlListSurveyGroupsTest.php Diff File
mod - tests/unit/helpers/RemoteControlTest.php Diff File
mod - themes/admin/Apple_Blossom/css/lime-admin-colors.css Diff File
add - themes/admin/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Apple_Blossom/css/lime-admin-common.css Diff File
mod - themes/admin/Bay_of_Many/css/lime-admin-colors.css Diff File
add - themes/admin/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Bay_of_Many/css/lime-admin-common.css Diff File
mod - themes/admin/Black_Pearl/css/lime-admin-colors.css Diff File
add - themes/admin/Black_Pearl/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Black_Pearl/css/lime-admin-common.css Diff File
mod - themes/admin/Dark_Sky/css/lime-admin-colors.css Diff File
add - themes/admin/Dark_Sky/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Dark_Sky/css/lime-admin-common.css Diff File
mod - themes/admin/Free_Magenta/css/lime-admin-colors.css Diff File
add - themes/admin/Free_Magenta/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Free_Magenta/css/lime-admin-common.css Diff File
mod - themes/admin/Noto_All_Languages/css/lime-admin-colors.css Diff File
add - themes/admin/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - themes/admin/Purple_Tentacle/css/lime-admin-colors.css Diff File
add - themes/admin/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - themes/admin/Sea_Green/css/lime-admin-colors.css Diff File
add - themes/admin/Sea_Green/css/lime-admin-common-rtl.css Diff File
add - themes/admin/Sea_Green/css/lime-admin-common.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
add - themes/admin/Sunset_Orange/css/lime-admin-common.css Diff File
mod - themes/survey/bootswatch/css/variations/basic.min.css Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/printanswers_question.twig Diff File
mod - third_party/moment/moment-with-locales.min.js Diff File