LimeSurvey: master c63d1c20

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz master 2020-01-15 14:36:50 master a85b0a7c
Changeset

Merge branch 'develop'
add - .eslintrc.json Diff File
mod - .gitignore Diff File
mod - .travis.yml Diff File
add - LICENSE Diff File
mod - README.md Diff File
mod - application/commands/CompileAssetsCommand.php Diff File
mod - application/commands/DemomodeCommand.php Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/InstallFromConfigCommand.php Diff File
mod - application/commands/TwigCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/fonts.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/questiontypes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
add - application/controllers/admin/LimeSurveyFileManager.php Diff File
add - application/controllers/admin/PermissiontemplatesController.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/TutorialEntryController.php Diff File
mod - application/controllers/admin/TutorialsController.php Diff File
add - application/controllers/admin/UserManagement.php Diff File
mod - application/controllers/admin/assessments.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/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
add - application/controllers/admin/questionedit.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
add - application/controllers/admin/questionthemes.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/themeoptions.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/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/ConsoleApplication.php Diff File
add - application/core/LSCActiveDataProvider.php Diff File
mod - application/core/LSCaptcha.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
add - application/core/LSJsonException.php Diff File
add - application/core/LSSodium.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_AssetManager.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LSYii_Controller.php Diff File
add - application/core/LSYii_NoUpdateValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
add - application/core/LimeMailer.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
add - application/core/QuestionTypes/5PointChoice/DataSetFivePointChoice.php Diff File
add - application/core/QuestionTypes/5PointChoice/RenderFivePointChoice.php Diff File
add - application/core/QuestionTypes/Array10ChoiceQuestions/DataSetArray10ChoiceQuestion.php Diff File
add - application/core/QuestionTypes/Array10ChoiceQuestions/RenderArray10ChoiceQuestion.php Diff File
add - application/core/QuestionTypes/Array5ChoiceQuestions/DataSetArray5ChoiceQuestion.php Diff File
add - application/core/QuestionTypes/Array5ChoiceQuestions/RenderArray5ChoiceQuestion.php Diff File
add - application/core/QuestionTypes/ArrayFlexibleColumn/DataSetArrayFlexibleColumn.php Diff File
add - application/core/QuestionTypes/ArrayFlexibleColumn/RendererArrayFlexibleColumn.php Diff File
add - application/core/QuestionTypes/ArrayFlexibleRow/DataSetArrayFlexibleRow.php Diff File
add - application/core/QuestionTypes/ArrayFlexibleRow/RenderArrayFlexibleRow.php Diff File
add - application/core/QuestionTypes/ArrayMultiFlexNumbers/DataSetArrayMultiFlexNumbers.php Diff File
add - application/core/QuestionTypes/ArrayMultiFlexNumbers/RenderArrayMultiFlexNumbers.php Diff File
add - application/core/QuestionTypes/ArrayMultiFlexText/DataSetArrayMultiFlexText.php Diff File
add - application/core/QuestionTypes/ArrayMultiFlexText/RenderArrayMultiFlexText.php Diff File
add - application/core/QuestionTypes/ArrayMultiscale/DataSetArrayMultiscale.php Diff File
add - application/core/QuestionTypes/ArrayMultiscale/RenderArrayMultiscale.php Diff File
add - application/core/QuestionTypes/ArrayOfIncSameDecQuestions/DataSetArrayOfIncSameDecQuestions.php Diff File
add - application/core/QuestionTypes/ArrayOfIncSameDecQuestions/RenderArrayOfIncSameDecQuestions.php Diff File
add - application/core/QuestionTypes/ArrayYesUncertainNo/DataSetArrayYesUncertainNo.php Diff File
add - application/core/QuestionTypes/ArrayYesUncertainNo/RenderArrayYesUncertainNo.php Diff File
add - application/core/QuestionTypes/BoilerplateQuestion/DataSetBoilerplate.php Diff File
add - application/core/QuestionTypes/BoilerplateQuestion/RenderBoilerplate.php Diff File
add - application/core/QuestionTypes/Date/DataSetDate.php Diff File
add - application/core/QuestionTypes/Date/RenderDate.php Diff File
add - application/core/QuestionTypes/DummyQuestion/DataSetDummyQuestion.php Diff File
add - application/core/QuestionTypes/DummyQuestion/RenderDummyQuestion.php Diff File
add - application/core/QuestionTypes/Equation/DataSetEquation.php Diff File
add - application/core/QuestionTypes/Equation/RenderEquation.php Diff File
add - application/core/QuestionTypes/FileUpload/DataSetFileUpload.php Diff File
add - application/core/QuestionTypes/FileUpload/RenderFileUpload.php Diff File
add - application/core/QuestionTypes/GenderDropdown/DataSetGenderDropdown.php Diff File
add - application/core/QuestionTypes/GenderDropdown/RenderGenderDropdown.php Diff File
add - application/core/QuestionTypes/HugeFreeText/DataSetHugeFreeText.php Diff File
add - application/core/QuestionTypes/HugeFreeText/RenderHugeFreeText.php Diff File
add - application/core/QuestionTypes/Language/DataSetLanguage.php Diff File
add - application/core/QuestionTypes/Language/RenderLanguageSelector.php Diff File
add - application/core/QuestionTypes/ListDropdown/DataSetListDropdown.php Diff File
add - application/core/QuestionTypes/ListDropdown/RenderListDropdown.php Diff File
add - application/core/QuestionTypes/ListRadio/DataSetListRadio.php Diff File
add - application/core/QuestionTypes/ListRadio/RenderListRadio.php Diff File
add - application/core/QuestionTypes/ListRadioFlexible/DataSetListRadioFlexible.php Diff File
add - application/core/QuestionTypes/ListRadioFlexible/RenderListRadioFlexible.php Diff File
add - application/core/QuestionTypes/ListWithComment/DataSetListWithComment.php Diff File
add - application/core/QuestionTypes/ListWithComment/RenderListComment.php Diff File
add - application/core/QuestionTypes/LoadQuestionTypes.php Diff File
add - application/core/QuestionTypes/LongFreeText/DataSetLongFreeText.php Diff File
add - application/core/QuestionTypes/LongFreeText/RenderLongFreeText.php Diff File
add - application/core/QuestionTypes/MultipleChoice/DataSetMultipleChoice.php Diff File
add - application/core/QuestionTypes/MultipleChoice/RenderMultipleChoice.php Diff File
add - application/core/QuestionTypes/MultipleChoiceWithComments/DataSetMultipleChoiceWithComments.php Diff File
add - application/core/QuestionTypes/MultipleChoiceWithComments/RenderMultipleChoiceWithComments.php Diff File
add - application/core/QuestionTypes/MultipleNumericalQuestion/DataSetMultipleNumerical.php Diff File
add - application/core/QuestionTypes/MultipleNumericalQuestion/RenderMultipleNumerical.php Diff File
add - application/core/QuestionTypes/MultipleShortText/DataSetMultipleShortText.php Diff File
add - application/core/QuestionTypes/MultipleShortText/RenderMultipleShortText.php Diff File
add - application/core/QuestionTypes/Numerical/DataSetNumerical.php Diff File
add - application/core/QuestionTypes/Numerical/RenderNumerical.php Diff File
add - application/core/QuestionTypes/RankingStyle/DataSetRanking.php Diff File
add - application/core/QuestionTypes/RankingStyle/RenderRanking.php Diff File
add - application/core/QuestionTypes/ShortFreeText/DataSetShortFreeText.php Diff File
add - application/core/QuestionTypes/ShortFreeText/RenderShortFreeText.php Diff File
add - application/core/QuestionTypes/YesNoRadio/DataSetYesNoRadio.php Diff File
add - application/core/QuestionTypes/YesNoRadio/RenderYesNoRadio.php Diff File
add - application/core/QuestionTypes/applyMinimumContent.js Diff File
add - application/core/QuestionTypes/package-lock.json Diff File
add - application/core/StaticModel.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
add - application/core/plugins/AuditLog/AuditLog.php Diff File
add - application/core/plugins/AuditLog/config.xml Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
add - application/core/plugins/AuthLDAP/config.xml Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
add - application/core/plugins/Authdb/config.xml Diff File
mod - application/core/plugins/Authwebserver/Authwebserver.php Diff File
add - application/core/plugins/Authwebserver/config.xml Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
add - application/core/plugins/ExportR/config.xml Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
add - application/core/plugins/ExportSTATAxml/config.xml Diff File
add - application/core/plugins/PasswordRequirement/PasswordRequirement.php Diff File
add - application/core/plugins/PasswordRequirement/config.xml Diff File
add - application/core/plugins/UpdateCheck/UpdateCheck.php Diff File
add - application/core/plugins/UpdateCheck/assets/js/updateCheck.js Diff File
add - application/core/plugins/UpdateCheck/config.xml Diff File
add - application/core/plugins/UpdateCheck/views/index.twig Diff File
add - application/core/plugins/customToken/LICENSE.txt Diff File
add - application/core/plugins/customToken/README.md Diff File
add - application/core/plugins/customToken/config.xml Diff File
add - application/core/plugins/customToken/customToken.php Diff File
add - application/core/plugins/expressionFixedDbVar/config.xml Diff File
add - application/core/plugins/expressionFixedDbVar/expressionFixedDbVar.php Diff File
add - application/core/plugins/expressionQuestionForAll/config.xml Diff File
add - application/core/plugins/expressionQuestionForAll/expressionQuestionForAll.php Diff File
add - application/core/plugins/expressionQuestionHelp/config.xml Diff File
add - application/core/plugins/expressionQuestionHelp/expressionQuestionHelp.php Diff File
add - application/core/plugins/expressionQuestionHelp/sample/limesurvey_survey_expressionQuestionHelp.lss Diff File
add - application/core/plugins/mailSenderToFrom/config.xml Diff File
add - application/core/plugins/mailSenderToFrom/mailSenderToFrom.php Diff File
add - application/core/plugins/oldUrlCompat/config.xml Diff File
mod - application/extensions/LimeScript/assets/script.js Diff File
mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/.babelrc Diff File
add - application/extensions/admin/PreviewModalWidget/assets/package-lock.json Diff File
add - application/extensions/admin/PreviewModalWidget/assets/package.json Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.js Diff File
add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.css Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.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/TextDisplaySwitch/TextDisplaySwitch.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/_selected_items.php Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty-lg.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no-lg.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/selector.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_action_results.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
rm - application/extensions/questionTypes/listRadio/config.xml Diff File
rm - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/CsvWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/SurveyObj.php Diff File
mod - application/helpers/admin/export/Writer.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/label_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/admin/token_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
add - application/helpers/expressions/emcache/em_cache_exception.php Diff File
add - application/helpers/expressions/emcache/em_cache_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_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/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
add - application/libraries/ExtensionInstaller/ExtensionInstaller.php Diff File
add - application/libraries/ExtensionInstaller/ExtensionUpdater.php Diff File
add - application/libraries/ExtensionInstaller/ExtensionUpdaterServiceLocator.php Diff File
add - application/libraries/ExtensionInstaller/FileFetcher.php Diff File
add - application/libraries/ExtensionInstaller/FileFetcherUploadZip.php Diff File
add - application/libraries/ExtensionInstaller/GitVersionFetcher.php Diff File
add - application/libraries/ExtensionInstaller/PluginInstaller.php Diff File
add - application/libraries/ExtensionInstaller/PluginUpdater.php Diff File
add - application/libraries/ExtensionInstaller/README.md Diff File
add - application/libraries/ExtensionInstaller/RESTVersionFetcher.php Diff File
add - application/libraries/ExtensionInstaller/ThemeUpdater.php Diff File
add - application/libraries/ExtensionInstaller/VersionFetcher.php Diff File
add - application/libraries/ExtensionInstaller/VersionFetcherServiceLocator.php Diff File
rm - application/libraries/LS/LS.php Diff File
rm - application/libraries/LS/src/LS/Exception.php Diff File
mod - application/libraries/MenuObjects/Menu.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
add - application/libraries/PluginManager/PluginManagerShutdownFunction.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
add - application/models/AnswerL10n.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/AssetVersion.php Diff File
add - application/models/Box.php Diff File
rm - application/models/Boxes.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
add - application/models/DefaultValueL10n.php Diff File
mod - application/models/ExpressionError.php Diff File
add - application/models/ExtensionConfig.php Diff File
add - application/models/ExtensionUpdateInfo.php Diff File
add - application/models/Field.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Label.php Diff File
add - application/models/LabelL10n.php Diff File