Changesets: LimeSurvey
|
master ef1d38c5 2018-06-06 14:55:52
|
Fixed issue: barebone URL not working from RPC | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
|
master f179e098 2018-06-06 13:39:23 Dominik Vitt Details Diff |
Fixed issue 13466: Exit and clear in bilingual Survey - restarts in wrong language |
Affected Issues 13466 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
develop b68f1d02 2018-06-06 12:47:48 Details Diff |
Merge branch 'master' into develop | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig | Diff File | ||
|
master fd1bda4f 2018-06-06 11:45:13 Dominik Vitt Details Diff |
Fixed issue 13553: Default value not copied when copy question Created "Copy default answers" switch option on Copy question page |
Affected Issues 13553 |
|
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
master 3283f3ea 2018-06-06 09:24:41 Details Diff |
Fixed issue : line feed stripped and not replaced in SPSS export Dev: flattenText remove whole |
Affected Issues 13731 |
|
| mod - application/helpers/export_helper.php | Diff File | ||
|
master ae342cb2 2018-06-06 09:11:36 Details Diff |
Fixed issue 13742 : empty label for dual-scale question |
Affected Issues 13742 |
|
| mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig | Diff File | ||
|
master 47355faf 2018-06-05 18:54:42
|
Dev: moved question selector to yii widget | ||
| add - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/build.sh | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.css | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.js | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.js | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.min.css | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.scss | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/views/open_modal_button.php | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/views/select_modal.php | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/views/simple_grouped_select.php | Diff File | ||
| add - application/extensions/admin/PreviewModalWidget/views/simple_select.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - assets/scripts/admin/questions.js | Diff File | ||
|
develop 0d6060d7 2018-06-05 16:14:59 Details Diff |
Merge branch 'master' into develop Conflicts: application/core/LsDefaultDataSets.php |
||
| mod - application/controllers/admin/themes.php | Diff File | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - themes/survey/vanilla/config.xml | Diff File | ||
| mod - themes/survey/vanilla/scripts/ajaxify.js | Diff File | ||
| mod - themes/survey/vanilla/views/layout_errors.twig | Diff File | ||
| mod - themes/survey/vanilla/views/layout_global.twig | Diff File | ||
| mod - themes/survey/vanilla/views/layout_survey_list.twig | Diff File | ||
| add - themes/survey/vanilla/views/subviews/footer/footer.twig | Diff File | ||
|
develop e6182d1e 2018-06-05 16:07:19 Details Diff |
Dev: Fix saving dual scale subquestions | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig | Diff File | ||
|
develop c3a97d27 2018-06-05 16:02:40 Details Diff |
Dev: Remove some unused code | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
|
master 65fd2f15 2018-06-05 15:47:40
|
Fixed issue: ajax mode was forced off. | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
develop d59525ec 2018-06-05 15:40:31 Details Diff |
Dev: Fix save for dual scale answer options | ||
| mod - application/controllers/admin/questions.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 - assets/scripts/admin/answers.js | Diff File | ||
|
master 578710db 2018-06-05 15:21:12 ecraven Committer: |
Dev: Add an empty footer to the vanilla theme. (#1079) | ||
| mod - themes/survey/vanilla/config.xml | Diff File | ||
| mod - themes/survey/vanilla/views/layout_errors.twig | Diff File | ||
| mod - themes/survey/vanilla/views/layout_global.twig | Diff File | ||
| mod - themes/survey/vanilla/views/layout_survey_list.twig | Diff File | ||
| add - themes/survey/vanilla/views/subviews/footer/footer.twig | Diff File | ||
|
master 9988d311 2018-06-05 15:20:53
Committer: |
New feature : Allow plugin to add or replace twig file (#1082) | ||
| mod - application/core/LSETwigViewRenderer.php | Diff File | ||
|
master 42080b55 2018-06-05 14:24:30 Dominik Vitt Details Diff |
Fixed issue #13558: Authenticated remote code execution by unrestricted file uploads |
Affected Issues 13558 |
|
| mod - application/controllers/admin/themes.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
develop d8ae3b70 2018-06-05 13:53:06 Details Diff |
Dev: Make dbversion start on 400 for LS4 to avoid conflict with master | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 0f710b33 2018-06-05 12:55:10
|
Fixed issue: Ajax-Mode totally unfunctional | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - themes/survey/vanilla/scripts/ajaxify.js | Diff File | ||
|
master 0ec0b3b1 2018-06-05 12:13:21
|
Dev: added a way to update option mode on update | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
master bbbf0d8a 2018-06-05 12:07:37
|
Refactor admin javascript part 3 | ||
| mod - application/config/packages.php | Diff File | ||
| mod - assets/packages/adminbasics/build/adminbasics.debug.js | Diff File | ||
| mod - assets/packages/adminbasics/build/adminbasics.js | Diff File | ||
| mod - assets/packages/adminbasics/build/adminbasics.min.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/bootstrap-remote-modals.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/confirmdeletemodal.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/lslog.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/notifications.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/panelclickable.js | Diff File | ||
| add - assets/packages/adminbasics/src/components/panelsanimation.js | Diff File | ||
| mod - assets/packages/adminbasics/src/main.js | Diff File | ||
| mod - assets/packages/adminbasics/src/pages/questionEditing.js | Diff File | ||
| mod - assets/packages/adminbasics/src/pages/quickaction.js | Diff File | ||
| mod - assets/packages/adminbasics/src/parts/ajaxHelper.js | Diff File | ||
| mod - assets/packages/adminbasics/src/parts/confirmationModal.js | Diff File | ||
| mod - assets/packages/adminbasics/src/parts/globalMethods.js | Diff File | ||
| add - assets/packages/adminbasics/src/parts/save.js | Diff File | ||
|
develop 859ccd0d 2018-06-05 11:30:44 Details Diff |
Merge branch 'master' into develop Conflicts: .travis.yml application/config/version.php application/helpers/expressions/em_manager_helper.php application/helpers/remotecontrol/remotecontrol_handle.php application/views/admin/survey/importSurvey_view.php |
||
| mod - .travis.yml | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/admin/themeoptions.php | Diff File | ||
| mod - application/controllers/admin/themes.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/core/LSYii_AssetManager.php | Diff File | ||
| mod - application/extensions/PanelBoxWidget/views/box.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/globalsettings_helper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| add - application/models/AssetVersion.php | Diff File | ||
| mod - application/models/Template.php | Diff File | ||
| mod - application/views/admin/survey/importSurvey_view.php | 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/ca/ca.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/hu/hu.mo | Diff File | ||
| mod - locale/nb/nb.mo | Diff File | ||
| mod - locale/pl/pl.mo | Diff File | ||
| mod - tests/controllers/CreateSurveyTest.php | Diff File | ||
|
master 75b51102 2018-06-05 11:26:57
|
Dev: ajax mode "on" by default | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
|
master 77595954 2018-06-05 10:21:17 Dominik Vitt Details Diff |
Fixed issue 13718: Reload page after import lss show error |
Affected Issues 13718 |
|
| mod - application/views/admin/survey/importSurvey_view.php | Diff File | ||
|
master_13513 0c94b633 2018-06-05 09:12:20 Details Diff |
Dev: default must set result and not return false | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
|
master_13513 b7cb2b55 2018-06-05 08:34:34 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_13513 | ||
| mod - application/config/version.php | Diff File | ||
|
master 603fff56 2018-06-05 08:32:36 Details Diff |
Dev: Update again after install Dev: and this broke … |
||
| mod - application/config/version.php | Diff File | ||
