Changesets: LimeSurvey
master 28ac566f 2021-05-14 10:49:33 Details Diff |
Merge branch 'master' into develop | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
master 620a46c7 2021-05-14 09:57:29 Committer: ollehar Details Diff |
dev: changed default value for html editor to 'Y' | ||
mod - installer/create-database.php | Diff File | ||
master 88af2897 2021-05-14 09:57:29 Details Diff |
dev: changed default value for html editor to 'Y' | ||
mod - installer/create-database.php | Diff File | ||
master 85857c9f 2021-05-14 09:48:51 Committer: ollehar Details Diff |
dev: refactor wrong naming of variable | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
master aa0db16b 2021-05-14 09:48:51 Details Diff |
dev: refactor wrong naming of variable | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
3.x-LTS 045c59d1 2021-05-12 17:26:46 Details Diff |
Dev Better error message | ||
mod - application/helpers/admin/import_helper.php | Diff File | ||
master 2fb71466 2021-05-12 16:30:44 Details Diff |
Fix phpunit issue | ||
mod - tests/functional/backend/CreateQuestionTest.php | Diff File | ||
mod - tests/functional/backend/CreateSurveyTest.php | Diff File | ||
master 303b8a73 2021-05-12 16:11:50 Details Diff |
Run composer update --no-dev | ||
mod - third_party/composer/InstalledVersions.php | Diff File | ||
mod - third_party/composer/installed.php | Diff File | ||
3.x-LTS 690a8bd7 2021-05-12 15:38:50 Details Diff |
Fixed issue #17291: Condition for multiple choice with comments question shows JS error |
Affected Issues 17291 |
|
mod - assets/scripts/expressions/em_javascript.js | Diff File | ||
master 5dac46d5 2021-05-12 15:15:09 Committer: ollehar Details Diff |
Fixed issue: the interface for copying participants from CPDB to survey did not display default names for custom attributes | ||
mod - application/models/ParticipantAttributeName.php | Diff File | ||
master b1f3fa6e 2021-05-12 15:14:15 Committer: ollehar Details Diff |
Fixed issue: If the cpdb had custom attributes and error would be displayed while trying access it / small ui size adjustment | ||
mod - application/models/Participant.php | Diff File | ||
mod - application/views/admin/participants/attributeMap_view.php | Diff File | ||
mod - assets/scripts/admin/attributeMap.js | Diff File | ||
master 3708321c 2021-05-12 12:37:37 Details Diff |
Merge branch 'master' into develop | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/UserManagementController.php | Diff File | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
mod - application/core/LsDefaultDataSets.php | Diff File | ||
mod - application/datavalueobjects/GeneralOption.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/settings/EncryptionGeneralOption.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/settings/GroupSelectorGeneralOption.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/settings/OtherGeneralOption.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/settings/SaveAsDefaultGeneralOption.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/views/questiongroup.php | Diff File | ||
mod - application/extensions/GeneralOptionWidget/views/switch.php | Diff File | ||
mod - application/extensions/TopbarWidget/views/includes/questionTopbarLeft_view.php | Diff File | ||
mod - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php | Diff File | ||
mod - application/extensions/admin/PreviewModalWidget/views/open_modal_button.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/models/User.php | Diff File | ||
add - application/models/services/PasswordManagement.php | Diff File | ||
add - application/views/admin/authentication/newPassword.php | Diff File | ||
mod - application/views/admin/globalsettings/_useradministration.php | Diff File | ||
mod - application/views/questionAdministration/codeAndType.php | Diff File | ||
mod - application/views/userManagement/partial/addedituser.php | Diff File | ||
mod - application/views/userManagement/partial/usernotificationemail.php | Diff File | ||
mod - installer/create-database.php | Diff File | ||
mod - tests/phpstan/phpstan_bootstrap.php | Diff File | ||
master a62f6cf6 2021-05-12 09:05:18 Details Diff |
dev: to prevent merging conflicts in dp-update some changes were made | ||
mod - application/config/version.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
master 56ebad17 2021-05-12 09:02:05 Details Diff |
Merge branch 'task/zoho-L41-T309-email-plain-password' # Conflicts: # application/config/version.php # application/helpers/update/updatedb_helper.php |
||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/UserManagementController.php | Diff File | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
mod - application/core/LsDefaultDataSets.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/models/User.php | Diff File | ||
add - application/models/services/PasswordManagement.php | Diff File | ||
add - application/views/admin/authentication/newPassword.php | Diff File | ||
mod - application/views/admin/globalsettings/_useradministration.php | Diff File | ||
mod - application/views/userManagement/partial/addedituser.php | Diff File | ||
mod - application/views/userManagement/partial/usernotificationemail.php | Diff File | ||
mod - installer/create-database.php | Diff File | ||
mod - tests/phpstan/phpstan_bootstrap.php | Diff File | ||
3.x-LTS 1651fd2e 2021-05-11 18:44:11 Details Diff |
Test without --testdox | ||
mod - .travis.yml | Diff File | ||
3.x-LTS 5fa36197 2021-05-11 18:11:33 Details Diff |
Manual PHP 8 patch in Twig | ||
mod - third_party/twig/twig/src/Node/IncludeNode.php | Diff File | ||
3.x-LTS e0c323e9 2021-05-11 18:01:19 Details Diff |
Add platform check | ||
add - third_party/composer/platform_check.php | Diff File | ||
3.x-LTS 8807ab1b 2021-05-11 17:59:06 Details Diff |
Proper commit of ETwigViewRenderer | ||
rm - third_party/yiiext/twig-renderer | Diff File | ||
add - third_party/yiiext/twig-renderer/ETwigViewRenderer.php | Diff File | ||
3.x-LTS 166dbc91 2021-05-11 17:56:18 Details Diff |
Commit new autoload files | ||
mod - third_party/composer/InstalledVersions.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 | ||
mod - third_party/composer/installed.php | Diff File | ||
3.x-LTS 4cf78cdc 2021-05-11 17:54:28 Details Diff |
Move Twig | ||
rm - third_party/Twig/ETwigViewRenderer.php | Diff File | ||
rm - third_party/Twig/README.md | Diff File | ||
rm - third_party/Twig/README_RU.md | Diff File | ||
rm - third_party/Twig/changelog.md | Diff File | ||
rm - third_party/Twig/composer.json | Diff File | ||
3.x-LTS 33eb2d3f 2021-05-11 17:51:28 Details Diff |
Fix autoload of Twig; require dev-master Yii Twig renderer | ||
mod - composer.json | Diff File | ||
3.x-LTS 6aaa3c8d 2021-05-11 17:51:01 Details Diff |
Preload ETwigViewRenderer | ||
mod - application/config/internal.php | Diff File | ||
master e009876f 2021-05-11 17:51:01 Details Diff |
Preload ETwigViewRenderer | ||
mod - application/config/internal.php | Diff File | ||
3.x-LTS 50613da3 2021-05-11 16:08:42 Details Diff |
Update Yii to 1.1.24dev | ||
mod - framework/cli/views/webapp/protected/tests/WebTestCase.php | Diff File | ||
mod - framework/test/CDbTestCase.php | Diff File | ||
mod - framework/test/CWebTestCase.php | Diff File | ||
3.x-LTS dbca0784 2021-05-11 15:25:50 Details Diff |
Disable debug = 2 in Travis | ||
mod - .travis.yml | Diff File |