LimeSurvey: master 37783ee8

Diff Back to Repository
Author Committer Branch Timestamp Parent
p_teichmann p_teichmann master 2021-07-02 19:34 master e831c4a7
Changeset

Merge branch 'master' into feature/L41-T54-can-not-hide-attribute

Conflicts:

application/extensions/AdvancedSettingWidget/views/layout.php
add - .github/workflows/main.yml Diff File
mod - .gitignore Diff File
mod - .scrutinizer.yml Diff File
rm - .travis.yml Diff
mod - README.md Diff File
mod - application/commands/DemomodeCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/internal.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/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/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/authentication.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/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/htmleditor_pop.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/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/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSSodium.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_ImageValidator.php Diff File
mod - application/core/LSYii_NoUpdateValidator.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/QuestionTypes/Date/RenderDate.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/TopbarConfiguration.php Diff File
mod - application/core/plugins/AuditLog/config.xml Diff File
mod - application/core/plugins/AuthLDAP/config.xml Diff File
mod - application/core/plugins/Authdb/config.xml Diff File
mod - application/core/plugins/Authwebserver/config.xml Diff File
mod - application/core/plugins/ComfortUpdateChecker/config.xml Diff File
mod - application/core/plugins/ExportR/config.xml Diff File
mod - application/core/plugins/ExportSTATAxml/config.xml Diff File
mod - application/core/plugins/PasswordRequirement/config.xml Diff File
mod - application/core/plugins/TwoFactorAdminLogin/config.xml Diff File
mod - application/core/plugins/TwoFactorAdminLogin/helper/phpqrcode.php Diff File
mod - application/core/plugins/UpdateCheck/config.xml Diff File
mod - application/core/plugins/customToken/config.xml Diff File
mod - application/core/plugins/expressionFixedDbVar/config.xml Diff File
mod - application/core/plugins/expressionQuestionForAll/config.xml Diff File
mod - application/core/plugins/expressionQuestionHelp/config.xml Diff File
mod - application/core/plugins/mailSenderToFrom/config.xml Diff File
mod - application/core/plugins/oldUrlCompat/config.xml Diff File
mod - application/core/plugins/statFunctions/config.xml Diff File
rm - application/core/web/LSYii_SecurityManager.php Diff
mod - application/datavalueobjects/GeneralOption.php Diff File
mod - application/extensions/AdminFooter/views/footer.php Diff File
mod - application/extensions/AdvancedSettingWidget/views/layout.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/EncryptionGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/GroupSelectorGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/OtherGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/RelevanceEquationGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/settings/SaveAsDefaultGeneralOption.php Diff File
mod - application/extensions/GeneralOptionWidget/views/layout.php Diff File
mod - application/extensions/GeneralOptionWidget/views/questiongroup.php Diff File
mod - application/extensions/GeneralOptionWidget/views/switch.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editGroupTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editQuestionTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.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
mod - application/extensions/TopbarWidget/views/includes/questionTopbarLeft_view.php Diff File
mod - application/extensions/TopbarWidget/views/includes/surveyTopbarLeft_view.php Diff File
mod - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.js Diff File
mod - application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php Diff File
mod - application/extensions/admin/PreviewModalWidget/views/open_modal_button.php Diff File
mod - application/extensions/admin/PreviewModalWidget/views/select_modal.php Diff File
mod - application/extensions/admin/PreviewModalWidget/views/simple_grouped_select.php Diff File
mod - application/extensions/admin/PreviewModalWidget/views/simple_select.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-apply.php Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-delete.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
mod - application/extensions/bootstrap/widgets/TbButtonColumn.php 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/common_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/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/surveytranslator_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/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/Answer.php Diff File
add - application/models/ArchivedTableSettings.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Box.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/LSActiveRecord.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/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/QuestionL10n.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/QuestionType.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/User.php Diff File
add - application/models/services/PasswordManagement.php Diff File
mod - application/models/services/QuestionAttributeHelper.php Diff File
add - application/models/services/UploadValidator.php Diff File
mod - application/tests/WebTestCase.php Diff File
mod - application/tests/unit/ExpressionManagerTest.php Diff File
rm - application/third_party/Twig/Autoloader.php Diff
rm - application/third_party/Twig/BaseNodeVisitor.php Diff
rm - application/third_party/Twig/Cache/Filesystem.php Diff
rm - application/third_party/Twig/Cache/Null.php Diff
rm - application/third_party/Twig/CacheInterface.php Diff
rm - application/third_party/Twig/CompilerInterface.php Diff
rm - application/third_party/Twig/Environment.php Diff
rm - application/third_party/Twig/Error.php Diff
rm - application/third_party/Twig/Error/Loader.php Diff
rm - application/third_party/Twig/Error/Runtime.php Diff
rm - application/third_party/Twig/Error/Syntax.php Diff
rm - application/third_party/Twig/ExistsLoaderInterface.php Diff
rm - application/third_party/Twig/ExpressionParser.php Diff
rm - application/third_party/Twig/Extension.php Diff
rm - application/third_party/Twig/Extension/AbstractExtension.php Diff
rm - application/third_party/Twig/Extension/Core.php Diff
rm - application/third_party/Twig/Extension/CoreExtension.php Diff
rm - application/third_party/Twig/Extension/Debug.php Diff
rm - application/third_party/Twig/Extension/Escaper.php Diff
rm - application/third_party/Twig/Extension/Optimizer.php Diff
rm - application/third_party/Twig/Extension/Profiler.php Diff
rm - application/third_party/Twig/Extension/ProfilerExtension.php Diff
rm - application/third_party/Twig/Extension/Sandbox.php Diff
rm - application/third_party/Twig/Extension/Staging.php Diff
rm - application/third_party/Twig/Extension/StringLoader.php Diff
rm - application/third_party/Twig/ExtensionInterface.php Diff
rm - application/third_party/Twig/Filter.php Diff
rm - application/third_party/Twig/Filter/Function.php Diff
rm - application/third_party/Twig/Filter/Method.php Diff
rm - application/third_party/Twig/Filter/Node.php Diff
rm - application/third_party/Twig/FilterCallableInterface.php Diff
rm - application/third_party/Twig/FilterInterface.php Diff
rm - application/third_party/Twig/Function.php Diff
rm - application/third_party/Twig/Function/Function.php Diff
rm - application/third_party/Twig/Function/Method.php Diff
rm - application/third_party/Twig/Function/Node.php Diff
rm - application/third_party/Twig/FunctionCallableInterface.php Diff
rm - application/third_party/Twig/FunctionInterface.php Diff
rm - application/third_party/Twig/Lexer.php Diff
rm - application/third_party/Twig/LexerInterface.php Diff
rm - application/third_party/Twig/Loader/Array.php Diff
rm - application/third_party/Twig/Loader/ArrayLoader.php Diff
rm - application/third_party/Twig/Loader/Chain.php Diff
rm - application/third_party/Twig/Loader/ChainLoader.php Diff
rm - application/third_party/Twig/Loader/Filesystem.php Diff
rm - application/third_party/Twig/Loader/FilesystemLoader.php Diff
rm - application/third_party/Twig/Loader/String.php Diff
rm - application/third_party/Twig/LoaderInterface.php Diff
rm - application/third_party/Twig/Node.php Diff
rm - application/third_party/Twig/Node/AutoEscape.php Diff
rm - application/third_party/Twig/Node/Block.php Diff
rm - application/third_party/Twig/Node/BlockReference.php Diff
rm - application/third_party/Twig/Node/Body.php Diff
rm - application/third_party/Twig/Node/CheckSecurity.php Diff
rm - application/third_party/Twig/Node/CheckSecurityNode.php Diff
rm - application/third_party/Twig/Node/Do.php Diff
rm - application/third_party/Twig/Node/Embed.php Diff
rm - application/third_party/Twig/Node/EmbedNode.php Diff
rm - application/third_party/Twig/Node/Expression.php Diff
rm - application/third_party/Twig/Node/Expression/Array.php Diff
rm - application/third_party/Twig/Node/Expression/AssignName.php Diff
rm - application/third_party/Twig/Node/Expression/Binary.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Add.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/And.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/BitwiseAnd.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/BitwiseOr.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/BitwiseXor.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Concat.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Div.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/EndsWith.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Equal.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/FloorDiv.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Greater.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/GreaterEqual.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/In.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Less.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/LessEqual.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Matches.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Mod.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Mul.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/NotEqual.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/NotIn.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Or.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Power.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Range.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/StartsWith.php Diff
rm - application/third_party/Twig/Node/Expression/Binary/Sub.php Diff
rm - application/third_party/Twig/Node/Expression/BlockReference.php Diff
rm - application/third_party/Twig/Node/Expression/BlockReferenceExpression.php Diff
rm - application/third_party/Twig/Node/Expression/Call.php Diff
rm - application/third_party/Twig/Node/Expression/CallExpression.php Diff
rm - application/third_party/Twig/Node/Expression/Conditional.php Diff
rm - application/third_party/Twig/Node/Expression/Constant.php Diff
rm - application/third_party/Twig/Node/Expression/ExtensionReference.php Diff
rm - application/third_party/Twig/Node/Expression/Filter.php Diff
rm - application/third_party/Twig/Node/Expression/Filter/Default.php Diff
rm - application/third_party/Twig/Node/Expression/Function.php Diff
rm - application/third_party/Twig/Node/Expression/GetAttr.php Diff
rm - application/third_party/Twig/Node/Expression/GetAttrExpression.php Diff
rm - application/third_party/Twig/Node/Expression/MethodCall.php Diff
rm - application/third_party/Twig/Node/Expression/Name.php Diff
rm - application/third_party/Twig/Node/Expression/NameExpression.php Diff
rm - application/third_party/Twig/Node/Expression/NullCoalesce.php Diff
rm - application/third_party/Twig/Node/Expression/Parent.php Diff
rm - application/third_party/Twig/Node/Expression/TempName.php Diff
rm - application/third_party/Twig/Node/Expression/Test.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Constant.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Defined.php Diff
rm - application/third_party/Twig/Node/Expression/Test/DefinedTest.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Divisibleby.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Even.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Null.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Odd.php Diff
rm - application/third_party/Twig/Node/Expression/Test/OddTest.php Diff
rm - application/third_party/Twig/Node/Expression/Test/Sameas.php Diff
rm - application/third_party/Twig/Node/Expression/TestExpression.php Diff
rm - application/third_party/Twig/Node/Expression/Unary.php Diff
rm - application/third_party/Twig/Node/Expression/Unary/Neg.php Diff
rm - application/third_party/Twig/Node/Expression/Unary/Not.php Diff
rm - application/third_party/Twig/Node/Expression/Unary/Pos.php Diff
rm - application/third_party/Twig/Node/Flush.php Diff
rm - application/third_party/Twig/Node/For.php Diff
rm - application/third_party/Twig/Node/ForLoop.php Diff
rm - application/third_party/Twig/Node/ForNode.php Diff
rm - application/third_party/Twig/Node/If.php Diff
rm - application/third_party/Twig/Node/IfNode.php Diff
rm - application/third_party/Twig/Node/Import.php Diff
rm - application/third_party/Twig/Node/Include.php Diff
rm - application/third_party/Twig/Node/IncludeNode.php Diff
rm - application/third_party/Twig/Node/Macro.php Diff
rm - application/third_party/Twig/Node/Module.php Diff
rm - application/third_party/Twig/Node/ModuleNode.php Diff
rm - application/third_party/Twig/Node/Node.php Diff
rm - application/third_party/Twig/Node/Print.php Diff