LimeSurvey: master 40d00a49

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz master 2021-03-26 11:15:16 master e3db3e61
Changeset

Merge branch 'master' into develop
mod - application/config/version.php Diff File
mod - application/controllers/LimereplacementfieldsController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/core/LSFileHelper.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/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/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/update/updatedb_helper.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/QuestionTheme.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/themes/importuploaded_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/questionAdministration/answerOptionRow.twig Diff File
mod - application/views/questionAdministration/textElements.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.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/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/pjax/pjax.js Diff File
mod - docs/release_notes.txt 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/fi/fi.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 - themes/admin/Apple_Blossom/css/lime-admin-colors.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.css Diff File
mod - themes/admin/Black_Pearl/css/lime-admin-colors.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.css Diff File
mod - themes/admin/Free_Magenta/css/lime-admin-colors.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.css Diff File
mod - themes/admin/Purple_Tentacle/css/lime-admin-colors.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.css Diff File
mod - themes/survey/bootswatch/css/variations/basic.min.css Diff File
mod - third_party/moment/moment-with-locales.min.js Diff File