Changesets: LimeSurvey
|
master 42080b55 2018-06-05 16:24 Dominik Vitt Details Diff |
Fixed issue #13558: Authenticated remote code execution by unrestricted file uploads | ||
| 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 15:53 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 14:55
Details Diff |
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 14:13
Details Diff |
Dev: added a way to update option mode on update | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
|
master bbbf0d8a 2018-06-05 14:07
Details Diff |
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 13:30 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 13:26
Details Diff |
Dev: ajax mode "on" by default | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
|
master 77595954 2018-06-05 12:21 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 11:12 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 10: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 10:32 Details Diff |
Dev: Update again after install Dev: and this broke … |
||
| mod - application/config/version.php | Diff File | ||
|
master_13513 d9f58f06 2018-06-05 10:27 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_13513 | ||
| mod - tests/controllers/CreateSurveyTest.php | Diff File | ||
|
master 81522fdf 2018-06-04 18:52 Dominik Vitt Details Diff |
Dev: fixed Create survey test | ||
| mod - tests/controllers/CreateSurveyTest.php | Diff File | ||
|
master_13513 08f2a9f3 2018-06-04 18:51 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_13513 | ||
| mod - application/config/version.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/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/AssetVersion.php | Diff File | ||
| mod - application/models/Template.php | Diff File | ||
| mod - installer/create-database.php | Diff File | ||
|
master c3d25219 2018-06-04 18:45
Committer: Details Diff |
Fix multiple issues with theme assets (#1048) Fixed issue 13606 : Unable to reset manually single asset Dev: hash function use for whole path, then global var set here Dev: generatePath is used path by path Fixed issue 13497 : Editor screen can be loaded without css after save Dev: moving global reset to only this template Dev: less time to generate assets Fixed issue 13596: template assets is not resetted when update config Dev: need to do it if user add a file in TemplateConfiguration_files_* Dev: do it only for global theme (?) Dev: move injectglobalsettings to LSYii_Application Dev: maybe create a now function to set all config ? Dev: Fix installmer and move all set configs part to one function Dev: Create a DB for asset version number and use it for Template Dev: fix upgrade , remove dev test lien :/ Fixed issue : reset asset when upload or delete a template file Dev: rename Template functions to be more clear (we don't delete really the asset directory) |
Affected Issues 13497, 13596, 13606 |
|
| 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/helpers/globalsettings_helper.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 - installer/create-database.php | Diff File | ||
|
master d8f91ff0 2018-06-04 18:40
Details Diff |
Dev: Revert "Dev: Assets hash solution (#1057)" This reverts commit 0d99224fc03bf498502ddfb387b89daa1bfe79d2. |
||
| mod - application/config/version.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/helpers/globalsettings_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| rm - application/models/AssetVersion.php | Diff | ||
| mod - application/models/Template.php | Diff File | ||
| mod - installer/create-database.php | Diff File | ||
|
master_13513 d1a5d3f9 2018-06-04 18:27 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_13513 | ||
| mod - .travis.yml | Diff File | ||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/RegisterController.php | Diff File | ||
| mod - application/controllers/admin/printablesurvey.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/Question/answerOptionsEdit_view.twig | Diff File | ||
| mod - application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig | Diff File | ||
| mod - application/views/survey/questions/answer/date/dropdown/answer.twig | Diff File | ||
| mod - assets/packages/questions/5pointchoice/scripts/slider-rating.js | Diff File | ||
| mod - assets/packages/questions/5pointchoice/scripts/star-rating.js | 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 | ||
|
master 2aac9fb6 2018-06-04 17:52 Dominik Vitt Details Diff |
Fixed issue 12032: Homepage boxes - external links opened twice when clicking icon |
Affected Issues 12032 |
|
| mod - application/extensions/PanelBoxWidget/views/box.php | Diff File | ||
|
master ba81a562 2018-06-04 17:43
Details Diff |
Dev: cleaning updatedb_helper | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master ac90d001 2018-06-04 17:42
Details Diff |
Dev: small fix on DBVersion | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 0d99224f 2018-06-04 17:23
Committer: Details Diff |
Dev: Assets hash solution (#1057) Fixed issue 13606 : Unable to reset manually single asset Dev: hash function use for whole path, then global var set here Dev: generatePath is used path by path Fixed issue 13497 : Editor screen can be loaded without css after save Dev: moving global reset to only this template Dev: less time to generate assets Fixed issue 13596: template assets is not resetted when update config Dev: need to do it if user add a file in TemplateConfiguration_files_* Dev: do it only for global theme (?) Dev: move injectglobalsettings to LSYii_Application Dev: maybe create a now function to set all config ? Dev: Fix installmer and move all set configs part to one function Dev: usage of DB for asset version number Dev: hash solution for indexed pk in DB Dev: oups on phpdoc Dev: same other improvment than other pull request Dev: broken update … remove test line ;) |
Affected Issues 13497, 13596, 13606 |
|
| mod - application/config/version.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/helpers/globalsettings_helper.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 - installer/create-database.php | Diff File | ||
|
master ac5c6852 2018-06-04 16:12
Details Diff |
Release 3.9.0+180604 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 307d4d6e 2018-06-04 16:07 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by qualitatuvic Updated translation: French (France) by arnaud21, b00z00 Updated translation: Hungarian by kkd Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Polish by elissa Updated translation: Polish (Informal) by elissa |
||
| 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 | ||
|
master bf27c4d8 2018-06-04 16:06
Details Diff |
Refactorisation of JavaScript Part 2 | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - application/views/layouts/popup.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 | ||
| mod - assets/packages/adminbasics/src/jqueryAdditions/isEmpty.js | Diff File | ||
| mod - assets/packages/adminbasics/src/main.js | Diff File | ||
|
master fc48346c 2018-06-04 16:03
Details Diff |
New feature 13732: Twig - add "striptags" allowed filters |
Affected Issues 13732 |
|
| mod - application/config/internal.php | Diff File | ||
