LimeSurvey: master 70182758
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
pstelling | pstelling | master | 2020-03-25 09:02:53 | master 33298a63 |
Changeset | Merge branch 'master' into bug/OP-674-anonymize-ip-adress Conflicts:application/config/version.php |
|||
mod - .gitignore | Diff File | |||
mod - application/config/internal.php | Diff File | |||
mod - application/config/version.php | Diff File | |||
mod - application/controllers/AdminController.php | Diff File | |||
mod - application/controllers/Statistics_userController.php | Diff File | |||
mod - application/controllers/SurveysController.php | Diff File | |||
mod - application/controllers/admin/LimeSurveyFileManager.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/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/statistics.php | Diff File | |||
mod - application/controllers/admin/surveyadmin.php | Diff File | |||
mod - application/controllers/admin/translate.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/plugins/AuditLog/config.xml | Diff File | |||
mod - application/core/plugins/AuthLDAP/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/oldUrlCompat/config.xml | 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_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/update/updatedb_helper.php | Diff File | |||
mod - application/helpers/userstatistics_helper.php | Diff File | |||
mod - application/models/Answer.php | Diff File | |||
mod - application/models/Assessment.php | Diff File | |||
mod - application/models/Condition.php | Diff File | |||
mod - application/models/DefaultValue.php | Diff File | |||
mod - application/models/Label.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/SurveysGroupsettings.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/labels/_labelviewtabcontent_view.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 | |||
mod - application/views/admin/super/footer.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/breadcrumb.php | Diff File | |||
mod - application/views/admin/surveysgroups/surveySettings.php | Diff File | |||
mod - assets/packages/filemanager/src/components/NavBar.vue | 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/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/scripts/admin/conditions.js | Diff File | |||
mod - docs/release_notes.txt | Diff File | |||
mod - locale/de/de.mo | 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 - locale/sv/sv.mo | Diff File | |||
mod - tests/functional/backend/SaveDualScaleAnswerOptionsTest.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 |