LimeSurvey: master 1e1a589e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2021-03-12 12:22:36 master 85351142
Changeset

Merge branch 'master' into task/zoho-L41-T499-codition-not-shown-correctly
mod - .travis.yml Diff File
mod - application/commands/DemomodeCommand.php Diff File
mod - application/commands/ResetPasswordCommand.php Diff File
mod - application/commands/UpdateDbCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/commands/console.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/fonts.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/QuestionAdministrationController.php Diff File
mod - application/controllers/QuestionGroupsAdministrationController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/SurveysGroupsPermissionController.php Diff File
mod - application/controllers/admin/PermissiontemplatesController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/QuestionTypes/ArrayMultiscale/RenderArrayMultiscale.php Diff File
mod - application/core/QuestionTypes/MultipleNumericalQuestion/RenderMultipleNumerical.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/UpdateCheck/UpdateCheck.php Diff File
mod - application/core/plugins/UpdateCheck/assets/js/updateCheck.js Diff File
rm - application/core/plugins/UpdateCheck/views/index.twig Diff File
mod - application/datavalueobjects/SimpleSurveyValues.php Diff File
mod - application/extensions/AdvancedSettingWidget/views/layout.php Diff File
mod - application/extensions/AdvancedSettingWidget/views/switch.php Diff File
mod - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.js Diff File
mod - application/extensions/admin/PreviewModalWidget/views/simple_grouped_select.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/README.md Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/adodb/adodb-time.inc_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/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
add - application/helpers/twig_translation_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/ExtensionInstaller/FileFetcherUploadZip.php Diff File
mod - application/libraries/ExtensionInstaller/ThemeUpdater.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.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
mod - application/models/AnswerL10n.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/ExtensionConfig.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Participant.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/QuestionBaseDataSet.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
mod - application/models/QuestionTheme.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/services/CopyQuestion.php Diff File
mod - application/models/services/CreateSurvey.php Diff File
mod - application/models/services/FilterImportedResources.php Diff File
mod - application/views/admin/globalsettings/_presentation.php Diff File
mod - application/views/admin/globalsettings/_security.php Diff File
mod - application/views/admin/participants/modal_subviews/_addToSurvey.php Diff File
mod - application/views/admin/permissiontemplates/partials/_form.php Diff File
mod - application/views/admin/permissiontemplates/partials/_view.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/queXMLSurvey_view.php Diff File
mod - application/views/admin/survey/subview/_survey_quickaction.php Diff File
mod - application/views/admin/survey/subview/_template_carousel.php Diff File
mod - application/views/admin/survey/subview/import_ressources_modal.php Diff File
mod - application/views/admin/survey/surveybar_activation.php Diff File
mod - application/views/admin/survey/surveybar_tools.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/assessment/assessments_view.php Diff File
mod - application/views/questionAdministration/advancedSettings.php Diff File
mod - application/views/questionAdministration/answerOptionRow.twig Diff File
mod - application/views/questionAdministration/answerOptions.twig Diff File
mod - application/views/questionAdministration/create.php Diff File
mod - application/views/questionAdministration/listquestions.php Diff File
mod - application/views/questionAdministration/subquestionRow.twig Diff File
mod - application/views/questionAdministration/textElements.php Diff File
mod - application/views/survey/questions/answer/5pointchoice/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/10point/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/5point/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/array/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/column/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/increasesamedecrease/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/multiflexi/config.xml Diff File
mod - application/views/survey/questions/answer/arrays/yesnouncertain/config.xml Diff File
mod - application/views/survey/questions/answer/boilerplate/config.xml Diff File
mod - application/views/survey/questions/answer/date/config.xml Diff File
mod - application/views/survey/questions/answer/equation/config.xml Diff File
mod - application/views/survey/questions/answer/file_upload/config.xml Diff File
mod - application/views/survey/questions/answer/gender/config.xml Diff File
mod - application/views/survey/questions/answer/hugefreetext/config.xml Diff File
mod - application/views/survey/questions/answer/language/config.xml Diff File
mod - application/views/survey/questions/answer/list_dropdown/config.xml Diff File
mod - application/views/survey/questions/answer/list_with_comment/config.xml Diff File
mod - application/views/survey/questions/answer/listradio/config.xml Diff File
mod - application/views/survey/questions/answer/longfreetext/config.xml Diff File
mod - application/views/survey/questions/answer/multiplechoice/config.xml Diff File
mod - application/views/survey/questions/answer/multiplechoice_with_comments/config.xml Diff File
mod - application/views/survey/questions/answer/multipleshorttext/config.xml Diff File
mod - application/views/survey/questions/answer/ranking/config.xml Diff File
mod - application/views/survey/questions/answer/yesno/config.xml Diff File
mod - application/views/surveyAdministration/tabCreate_view.php Diff File
mod - application/views/themeOptions/index.php Diff File
mod - application/views/themeOptions/installedthemelist.php Diff File
rm - application/views/themeOptions/installedthemes.php Diff File
mod - application/views/themeOptions/options_core.php Diff File
mod - application/views/themeOptions/surveythememenu.php Diff File
mod - application/views/userGroup/viewUserGroup_view.php Diff File
mod - assets/packages/adminbasics/babel.config.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
mod - 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/package.json Diff File
mod - assets/packages/adminbasics/rollup.config.js Diff File
mod - assets/packages/adminbasics/src/parts/save.js Diff File
mod - assets/packages/adminbasics/yarn.lock 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
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/lib/surveysettings.js Diff File
mod - assets/packages/ckeditor/CHANGES.md Diff File
mod - assets/packages/ckeditor/LICENSE.md Diff File
mod - assets/packages/ckeditor/README.md Diff File
add - assets/packages/ckeditor/adapters/jquery.js Diff File
mod - assets/packages/ckeditor/build-config.js Diff File
mod - assets/packages/ckeditor/ckeditor.js Diff File
rm - assets/packages/ckeditor/ckeditor.min.js Diff File
mod - assets/packages/ckeditor/config.js Diff File
mod - assets/packages/ckeditor/contents.css Diff File
mod - assets/packages/ckeditor/lang/af.js Diff File
mod - assets/packages/ckeditor/lang/ar.js Diff File
mod - assets/packages/ckeditor/lang/az.js Diff File
mod - assets/packages/ckeditor/lang/bg.js Diff File
mod - assets/packages/ckeditor/lang/bn.js Diff File
mod - assets/packages/ckeditor/lang/bs.js Diff File
mod - assets/packages/ckeditor/lang/ca.js Diff File
mod - assets/packages/ckeditor/lang/cs.js Diff File
mod - assets/packages/ckeditor/lang/cy.js Diff File
mod - assets/packages/ckeditor/lang/da.js Diff File
mod - assets/packages/ckeditor/lang/de-ch.js Diff File
mod - assets/packages/ckeditor/lang/de.js Diff File
mod - assets/packages/ckeditor/lang/el.js Diff File
mod - assets/packages/ckeditor/lang/en-au.js Diff File
mod - assets/packages/ckeditor/lang/en-ca.js Diff File
mod - assets/packages/ckeditor/lang/en-gb.js Diff File
mod - assets/packages/ckeditor/lang/en.js Diff File
mod - assets/packages/ckeditor/lang/eo.js Diff File
mod - assets/packages/ckeditor/lang/es-mx.js Diff File
mod - assets/packages/ckeditor/lang/es.js Diff File
mod - assets/packages/ckeditor/lang/et.js Diff File
mod - assets/packages/ckeditor/lang/eu.js Diff File
mod - assets/packages/ckeditor/lang/fa.js Diff File
mod - assets/packages/ckeditor/lang/fi.js Diff File
mod - assets/packages/ckeditor/lang/fo.js Diff File
mod - assets/packages/ckeditor/lang/fr-ca.js Diff File
mod - assets/packages/ckeditor/lang/fr.js Diff File
mod - assets/packages/ckeditor/lang/gl.js Diff File
mod - assets/packages/ckeditor/lang/gu.js Diff File
mod - assets/packages/ckeditor/lang/he.js Diff File
mod - assets/packages/ckeditor/lang/hi.js Diff File
mod - assets/packages/ckeditor/lang/hr.js Diff File
mod - assets/packages/ckeditor/lang/hu.js Diff File
mod - assets/packages/ckeditor/lang/id.js Diff File
mod - assets/packages/ckeditor/lang/is.js Diff File
mod - assets/packages/ckeditor/lang/it.js Diff File
mod - assets/packages/ckeditor/lang/ja.js Diff File
mod - assets/packages/ckeditor/lang/ka.js Diff File
mod - assets/packages/ckeditor/lang/km.js Diff File
mod - assets/packages/ckeditor/lang/ko.js Diff File
mod - assets/packages/ckeditor/lang/ku.js Diff File
mod - assets/packages/ckeditor/lang/lt.js Diff File
mod - assets/packages/ckeditor/lang/lv.js Diff File
mod - assets/packages/ckeditor/lang/mk.js Diff File
mod - assets/packages/ckeditor/lang/mn.js Diff File
mod - assets/packages/ckeditor/lang/ms.js Diff File
mod - assets/packages/ckeditor/lang/nb.js Diff File
mod - assets/packages/ckeditor/lang/nl.js Diff File
mod - assets/packages/ckeditor/lang/no.js Diff File
mod - assets/packages/ckeditor/lang/oc.js Diff File
mod - assets/packages/ckeditor/lang/pl.js Diff File
mod - assets/packages/ckeditor/lang/pt-br.js Diff File
mod - assets/packages/ckeditor/lang/pt.js Diff File
mod - assets/packages/ckeditor/lang/ro.js Diff File
mod - assets/packages/ckeditor/lang/ru.js Diff File
mod - assets/packages/ckeditor/lang/si.js Diff File
mod - assets/packages/ckeditor/lang/sk.js Diff File
mod - assets/packages/ckeditor/lang/sl.js Diff File
mod - assets/packages/ckeditor/lang/sq.js Diff File
mod - assets/packages/ckeditor/lang/sr-latn.js Diff File
mod - assets/packages/ckeditor/lang/sr.js Diff File
mod - assets/packages/ckeditor/lang/sv.js Diff File
mod - assets/packages/ckeditor/lang/th.js Diff File
mod - assets/packages/ckeditor/lang/tr.js Diff File
mod - assets/packages/ckeditor/lang/tt.js Diff File
mod - assets/packages/ckeditor/lang/ug.js Diff File
mod - assets/packages/ckeditor/lang/uk.js Diff File
mod - assets/packages/ckeditor/lang/vi.js Diff File
mod - assets/packages/ckeditor/lang/zh-cn.js Diff File
mod - assets/packages/ckeditor/lang/zh.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/CHANGES.md Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/LICENSE.md Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/README.md Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/libs/quail/preconditions.json Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/libs/quail/quail.jquery.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/libs/quail/quail.jquery.min.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/libs/quail/tests.json Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/AddTableCaption.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/AnchorsMerge.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/AttributeRename.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/AttributeRenameDefault.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/DateUnfold.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/ElementRemove.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/ElementReplace.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/ImgAlt.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/ImgAltNonEmpty.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/LocalizedRepository.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/ParagraphToHeader.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/QuickFix.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/de/TableHeaders.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/AddTableCaption.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/AnchorsMerge.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/AttributeRename.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/AttributeRenameDefault.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/DateUnfold.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/ElementRemove.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/ElementReplace.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/ImgAlt.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/ImgAltNonEmpty.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/LocalizedRepository.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/ParagraphToHeader.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/QuickFix.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/en/TableHeaders.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/AddTableCaption.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/AnchorsMerge.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/AttributeRename.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/AttributeRenameDefault.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/DateUnfold.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/ElementRemove.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/ElementReplace.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/ImgAlt.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/ImgAltNonEmpty.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/LocalizedRepository.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/ParagraphToHeader.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/QuickFix.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/quickfix/nl/TableHeaders.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/AddTableCaption.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/AnchorsMerge.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/AttributeRename.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/AttributeRenameDefault.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/DateUnfold.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/ElementRemove.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/ElementReplace.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/ImgAlt.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/ImgAltNonEmpty.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/LocalizedRepository.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/ParagraphToHeader.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/QuickFix.js Diff File
add - assets/packages/ckeditor/plugins/a11ychecker/quickfix/pt-br/TableHeaders.js Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/skins/moono-lisa/a11ychecker.css Diff File
mod - assets/packages/ckeditor/plugins/a11ychecker/skins/moono-lisa/contents.css Diff File