Changesets: LimeSurvey
|
develop 16702ee4 2018-03-14 12:21 Details Diff |
Dev Merge branch 'master' into develop # Resolved conflicts: # application/config/version.php # application/controllers/admin/surveyadmin.php # application/helpers/expressions/em_manager_helper.php # application/models/Survey.php # application/models/Tutorial.php # application/views/admin/survey/surveySummary_view.php |
||
| mod - .gitignore | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
| add - application/extensions/admin/TextDisplaySwitch/README.md | Diff File | ||
| add - application/extensions/admin/TextDisplaySwitch/TextDisplaySwitch.php | Diff File | ||
| add - application/extensions/admin/TextDisplaySwitch/assets/textDisplaySwitch.js | Diff File | ||
| add - application/extensions/admin/TextDisplaySwitch/views/default.php | Diff File | ||
| add - application/extensions/admin/TextDisplaySwitch/views/short.php | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | ||
| mod - application/helpers/admin/survey_helper.php | Diff File | ||
| mod - application/helpers/common_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/questionHelper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/helpers/viewHelper.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/SurveyLanguageSetting.php | Diff File | ||
| mod - application/models/TemplateConfig.php | Diff File | ||
| mod - application/models/Tutorial.php | Diff File | ||
| mod - application/views/admin/checkintegrity/check_view.php | Diff File | ||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - application/views/admin/export/statistics_user_view.php | Diff File | ||
| mod - application/views/admin/export/statistics_view.php | Diff File | ||
| mod - application/views/admin/global_settings/_email.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/massive_actions/_selector.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php | Diff File | ||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig | Diff File | ||
| rm - assets/packages/adminpanel/.eslint.json | Diff | ||
| mod - assets/packages/adminpanel/.eslintrc.json | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.debug.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.css | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.js | Diff File | ||
| mod - assets/packages/adminpanel/package.json | Diff File | ||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/main.js | Diff File | ||
| mod - assets/packages/adminpanel/yarn.lock | Diff File | ||
| mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js | Diff File | ||
| mod - assets/scripts/admin/statistics.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/de-informal/de-informal.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/nb/nb.mo | Diff File | ||
| mod - locale/pl/pl.mo | Diff File | ||
| mod - themes/survey/bootswatch/css/theme.css | Diff File | ||
| mod - themes/survey/fruity/css/theme.css | Diff File | ||
| mod - themes/survey/vanilla/css/theme.css | Diff File | ||
| mod - themes/survey/vanilla/scripts/theme.js | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/content/firstpage.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy.twig | Diff File | ||
| add - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | ||
| add - themes/survey/vanilla/views/subviews/privacy/privacy_text.twig | Diff File | ||
|
master 14293691 2018-03-14 11:47
Details Diff |
Fixed issue: relay on surveymodel rather than on inherited setting | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 60cee175 2018-03-14 11:32
Details Diff |
Dev: attempt to reduce double posting resulting in empty resonse sets | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master_advHelp 6331168c 2018-03-13 21:32 Details Diff |
Dev: Add a button to show help inline | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
|
master eb8a4216 2018-03-13 21:06 Details Diff |
Dev: fix question adv settings , debug=2 | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
|
master a875677a 2018-03-13 17:19
Committer: GitHub Details Diff |
Dev: Better view of readonly advanced setting (#1012) Dev: replace html by CHtml , cleaner since we already have widget Dev: same usage of readonly with and without language |
||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | ||
|
master a8a464a7 2018-03-13 14:36
Details Diff |
Dev: some small fixes to em_manager_helper | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 766e8109 2018-03-13 14:36
Details Diff |
Revert "Dev: some small fixes to em_manager_helper" This reverts commit a8a464a72c9b4533335d8db084d5ca8fefc50d1c. |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 8382937d 2018-03-13 13:54
Details Diff |
Dev: Fixed survey saving options | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 9ed2ff0f 2018-03-13 13:54
Details Diff |
Revert "Dev: Fixed survey saving options" This reverts commit 8382937d470a6c1cc7e09f76ee3769b3d73699dc. |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 11af680c 2018-03-13 13:19 Details Diff |
Fixed issue: Sporadic update error message on login right after upgrade | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 22ee0e94 2018-03-13 13:18
Details Diff |
Dev: refactor and cleaning of em_manager_helper to reduce double postings | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 0fbe67af 2018-03-13 13:18
Details Diff |
Revert "Dev: refactor and cleaning of em_manager_helper to reduce double postings" This reverts commit 22ee0e94d8ae6a4477b35ab83f1b54cb2f98a8ac. |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 412486c0 2018-03-13 12:12 Details Diff |
Dev: Show error message if dbversionumber = currentdbversion in check | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
|
master 49134c39 2018-03-12 16:58
Details Diff |
Dev: one more gitignore change | ||
| mod - .gitignore | Diff File | ||
|
master 4c3a14e3 2018-03-12 16:53
Details Diff |
Fixed issue 13422: Dropdown menu in portuguese internal server error |
Affected Issues 13422 |
|
| mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php | Diff File | ||
|
master ed43d5a1 2018-03-12 16:53 Details Diff |
Release 3.5.1+180312 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 7284018f 2018-03-12 16:39
Details Diff |
Fixed issue 13247: missing translation in beginner tour |
Affected Issues 13247 |
|
| mod - application/core/LsDefaultDataSets.php | Diff File | ||
| mod - application/models/Tutorial.php | Diff File | ||
|
master 2b46b999 2018-03-12 16:10
Details Diff |
Dev: removed debug | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
|
master 4af117d8 2018-03-12 16:08
Details Diff |
Fixed issue: multiple inSurveyView height related problems | ||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| rm - assets/packages/adminpanel/.eslint.json | Diff | ||
| mod - assets/packages/adminpanel/.eslintrc.json | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.debug.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.js | Diff File | ||
| mod - assets/packages/adminpanel/package.json | Diff File | ||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | ||
| mod - assets/packages/adminpanel/src/main.js | Diff File | ||
| mod - assets/packages/adminpanel/yarn.lock | Diff File | ||
|
master 3b416c6f 2018-03-12 15:57 Details Diff |
Fixed issue: Cannot install on MSSQL server | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
|
master aa7b54c1 2018-03-12 15:15 Details Diff |
Dev: Set emulatePrepare to correct value if using MSSQL | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
|
master c6479cbd 2018-03-12 15:07
Details Diff |
Fixed issue 12715: Behavior change for numericalmultiple Slider default value when 0 or null Upgraded PHP version |
Affected Issues 12715 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig | Diff File | ||
| mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js | Diff File | ||
|
master 32369019 2018-03-12 14:53 Details Diff |
Fixed issue: Wrong DSN to MSSQL during install | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
|
master e700e791 2018-03-12 13:32
Details Diff |
Dev: changed gitignore again | ||
| mod - .gitignore | Diff File | ||
