LimeSurvey: master 9bbf91dd

Diff Back to Repository
Author Committer Branch Timestamp Parent
pstelling pstelling master 2021-02-25 12:13 master 424b623c
Changeset

Merge remote-tracking branch 'origin/master' into task/zoho-L41-T388-check-all-switches-for-int-in-db

Conflicts:

application/config/version.php
mod - .travis.yml Diff File
mod - application/config/version.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/helpers/twig_translation_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/ExtensionInstaller/FileFetcherUploadZip.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/AnswerL10n.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
mod - application/models/Template.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/participants/modal_subviews/_addToSurvey.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/assessment/assessments_view.php Diff File
mod - application/views/survey/questions/answer/list_with_comment/config.xml Diff File
mod - application/views/themeOptions/surveythememenu.php Diff File
mod - composer.json Diff File
mod - docs/release_notes.txt Diff File
mod - psalm.xml Diff File
mod - tests/bootstrap.php Diff File
rm - tests/data/datasets/participantattributes.xml Diff
mod - tests/phpstan/phpstan_bootstrap.php Diff File
mod - tests/rulesets/phpmd_ruleset.xml Diff File
mod - tests/unit/controllers/ParticipantActionTest.php Diff File
mod - tests/unit/helpers/RemoteControlTest.php Diff File