LimeSurvey: master fec30c52

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar1 ollehar1 master 2020-04-21 14:19:52 master f6ff7d08
Changeset

Merge branch 'develop' into feature/15999-remotecontrol-extend-list-participants
add - .eslintignore Diff File
mod - .gitignore Diff File
mod - .travis.yml Diff File
mod - CONTRIBUTING.md Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/InstallFromConfigCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
add - application/controllers/LSBaseController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
add - application/controllers/UserGroupController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/LimeSurveyFileManager.php Diff File
mod - application/controllers/admin/PermissiontemplatesController.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
rm - application/controllers/admin/SettingsUserController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/assessments.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/expressions.php Diff File
mod - application/controllers/admin/globalsettings.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/printablesurvey.php Diff File
mod - application/controllers/admin/questionedit.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
rm - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSWebUser.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LimeMailer.php Diff File
mod - application/core/QuestionTypes/ArrayFlexibleRow/RenderArrayFlexibleRow.php Diff File
mod - application/core/QuestionTypes/ArrayMultiscale/RenderArrayMultiscale.php Diff File
mod - application/core/QuestionTypes/ListDropdown/RenderListDropdown.php Diff File
mod - application/core/QuestionTypes/ListRadio/RenderListRadio.php Diff File
mod - application/core/QuestionTypes/ListWithComment/RenderListComment.php Diff File
mod - application/core/QuestionTypes/MultipleChoice/RenderMultipleChoice.php Diff File
mod - application/core/QuestionTypes/MultipleChoiceWithComments/RenderMultipleChoiceWithComments.php Diff File
mod - application/core/QuestionTypes/MultipleNumericalQuestion/RenderMultipleNumerical.php Diff File
mod - application/core/QuestionTypes/MultipleShortText/RenderMultipleShortText.php Diff File
mod - application/core/QuestionTypes/RankingStyle/RenderRanking.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/customToken/customToken.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/_selected_items.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_change_survey_group.php Diff File
add - application/helpers/LayoutHelper.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/label_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/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Box.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionBaseDataSet.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
mod - application/models/QuestionCreate.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/SurveysGroupsettings.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/models/UserParser.php Diff File
add - application/models/services/IpAddressAnonymizer.php Diff File
mod - application/views/admin/assessments/assessments_view.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/globalsettings/_security.php Diff File
mod - application/views/admin/labels/_labelviewtabcontent_view.php Diff File
mod - application/views/admin/permissiontemplates/partials/_form.php Diff File
mod - application/views/admin/pluginmanager/configure.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/viewquotas_quota_members_item.php Diff File
rm - application/views/admin/settingsUser/index.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_question_group_position.php Diff File
mod - application/views/admin/survey/Question/nquestion_subviews/_tabs.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_tabs.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.old.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.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/surveydashboard/004-generalsettingspanel.twig Diff File
mod - application/views/admin/survey/topbar/responses_topbar.php Diff File
mod - application/views/admin/surveysgroups/surveySettings.php Diff File
mod - application/views/admin/update/_ajaxVariables.php Diff File
mod - application/views/admin/user/modifyuser.php Diff File
rm - application/views/admin/usergroup/mailUserGroup_view.php Diff File
rm - application/views/admin/usergroup/plain.php Diff File
rm - application/views/admin/usergroup/usergroups_view.php Diff File
add - application/views/layouts/adminmenu.php Diff File
add - application/views/layouts/fullpagebar_view.php Diff File
add - application/views/layouts/header.php Diff File
mod - application/views/layouts/main.php Diff File
add - application/views/layouts/messagebox.php Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - application/views/survey/questions/question_help/mandatory_tip.twig Diff File
add - application/views/userGroup/mailUserGroup_view.php Diff File
add - application/views/userGroup/usergroups_view.php Diff File
rm - assets/packages/adapters/jquery.js Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/build.min/js/adminsidepanel.js.map Diff File
mod - assets/packages/adminsidepanel/build/js/adminsidepanel.js Diff File
mod - assets/packages/adminsidepanel/src/adminsidepanelmain.js Diff File
mod - assets/packages/admintoppanel/build.min/css/admintoppanel.css Diff File
mod - assets/packages/admintoppanel/build.min/css/admintoppanel.rtl.css Diff File
mod - assets/packages/admintoppanel/build.min/js/admintoppanel.js Diff File
mod - assets/packages/admintoppanel/build/css/admintoppanel.css.map Diff File
mod - assets/packages/admintoppanel/build/js/admintoppanel.js Diff File
mod - assets/packages/admintoppanel/build/js/admintoppanel.js.map Diff File
mod - assets/packages/admintoppanel/src/admintoppanelmain.js Diff File
mod - assets/packages/admintoppanel/src/components/subcomponents/TopBarButton.vue Diff File
add - assets/packages/expressionscript/expression.js Diff File
add - assets/packages/expressionscript/expressions.css Diff File
mod - assets/packages/filemanager/build.min/css/main.css Diff File
mod - assets/packages/filemanager/build.min/js/filemanager.js Diff File
mod - assets/packages/filemanager/build.min/js/filemanager.js.map Diff File
mod - assets/packages/filemanager/build/js/filemanager.js Diff File
mod - assets/packages/filemanager/coverage/lcov-report/index.html Diff File
mod - assets/packages/filemanager/src/App.vue Diff File
mod - assets/packages/filemanager/src/components/FileList.vue Diff File
mod - assets/packages/filemanager/src/components/FolderList.vue Diff File
mod - assets/packages/filemanager/src/components/NavBar.vue Diff File
mod - assets/packages/filemanager/src/components/subcomponents/_tableRepresentation.vue Diff File
mod - assets/packages/filemanager/src/components/subcomponents/_treeView.vue Diff File
mod - assets/packages/filemanager/src/filemanagermain.js Diff File
mod - assets/packages/filemanager/src/helperComponents/abstractRepresentation.vue Diff File
mod - assets/packages/filemanager/src/storage/actions.js Diff File
mod - assets/packages/filemanager/src/storage/state.js Diff File
add - assets/packages/filemanager/tests/mocks/fileList3.json Diff File
mod - assets/packages/filemanager/tests/unit/FileList.spec.js Diff File
mod - assets/packages/filemanager/tests/unit/FolderList.spec.js Diff File
mod - assets/packages/filemanager/tests/unit/_tableRepresentation.spec.js Diff File
add - assets/packages/filemanager/tests/unit/abstractRepresentation.spec.js Diff File
mod - assets/packages/filemanager/yarn.lock Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - assets/packages/questioneditor/build.min/css/main.css Diff File
mod - assets/packages/questioneditor/build.min/js/questionedit.js Diff File
mod - assets/packages/questioneditor/build.min/js/questionedit.js.map Diff File
mod - assets/packages/questioneditor/build/js/questionedit.js Diff File
mod - assets/packages/questioneditor/build/js/questionedit.js.map Diff File
mod - assets/packages/questioneditor/src/App.vue Diff File
mod - assets/packages/questioneditor/src/components/_inputtypes/buttongroup.vue Diff File
mod - assets/packages/questioneditor/src/components/_inputtypes/text.vue Diff File
mod - assets/packages/questioneditor/src/components/_inputtypes/textarea.vue Diff File
mod - assets/packages/questioneditor/src/components/_inputtypes/textdisplay.vue Diff File
mod - assets/packages/questioneditor/src/helperComponents/QuestionTypeSelector.vue Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/packages/questions/upload/build/uploadquestion.js Diff File
mod - assets/packages/questions/upload/build/uploadquestion.min.js Diff File
mod - assets/packages/questions/upload/build/uploadquestion.min.js.map Diff File
mod - assets/packages/questions/upload/package.json Diff File
mod - assets/packages/questions/upload/src/modaldialog.js Diff File
mod - assets/packages/questions/upload/yarn.lock Diff File
rm - assets/scripts/admin/ckeditor-config.js Diff File
mod - assets/scripts/admin/comfortupdate/buildComfortButtons.js Diff File
mod - assets/scripts/admin/comfortupdate/displayComfortStep.js Diff File
mod - composer.json 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/fi/fi.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - tests/TestBaseClassWeb.php Diff File
add - tests/data/surveys/limesurvey_survey_573837.lss Diff File
mod - tests/data/views/adminGeneralSettingsViews.php Diff File
add - tests/functional/acceptance/15997-ip-anonymize/IpAddressAnonymizeTest.php Diff File
mod - tests/functional/backend/AdminViewsTest.php Diff File
mod - tests/functional/backend/ChangeQuestionTemplateTest.php Diff File
mod - tests/functional/backend/NoGreenBarTest.php Diff File
mod - tests/functional/backend/SaveDualScaleAnswerOptionsTest.php Diff File
rm - tests/functional/frontend/AjaxModeTest.php Diff File
mod - tests/unit/controllers/UserManagementTest.php Diff File
mod - tests/unit/helpers/CheckDatabaseJsonValuesTest.php Diff File
add - tests/unit/models/IpAddressAnonymizerTest.php Diff File
mod - themes/survey/vanilla/views/subviews/content/firstpage.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/warnings.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/language_changer_first_page.twig Diff File
mod - third_party/composer/ClassLoader.php Diff File
mod - third_party/composer/autoload_psr4.php Diff File
mod - third_party/composer/autoload_real.php Diff File
mod - third_party/composer/autoload_static.php Diff File