Changesets: LimeSurvey

master 2577e467

2019-01-21 09:52:59

DenisChenu

Details Diff
Fixed issue : 500 error just after survey creation
Dev: QuestionGroup and its behaviors do not have a method or closure named "getByPk".
Dev: and pk for QuestionGroup (and Question) in 3.X is an array
Attach Issues:
mod - application/models/SurveymenuEntryData.php Diff File

develop 4dc6d4ff

2019-01-19 16:58:40

DenisChenu

Details Diff
Dev: don't set owner_id to anything else than id (since it's used in control in view …)
Attach Issues:
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/models/SurveysGroupsettings.php Diff File
mod - application/views/admin/survey/subview/surveydashboard/004-generalsettingspanel.twig Diff File

develop 484f6153

2019-01-18 19:49:55

DenisChenu


Committer: GitHub Details Diff
Merge pull request #1209 from Shnoulle/develop_mergeMaster

Develop merge master
Attach Issues:
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/expressions/em_core_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/replacements_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/third_party/pchart/pData.class.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/survey/questions/answer/ranking/rows/answer_row.twig Diff File
mod - assets/fonts/noto.css Diff File
add - assets/packages/bootstrap/img/loader.gif Diff File
mod - assets/packages/bootstrap/yiistrap.css Diff File
mod - assets/packages/bootstrap/yiistrap.min.css Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js Diff File
mod - docs/release_notes.txt 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/hr/hr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - themes/survey/vanilla/views/subviews/navigation/question_index_questions_buttons.twig Diff File

develop 81a31a33

2019-01-18 19:45:37

DenisChenu

Details Diff
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

# Conflicts:
# application/config/version.php
# application/controllers/admin/database.php
# application/helpers/expressions/em_manager_helper.php
# application/models/Question.php
# application/views/admin/survey/Question/editQuestion_view.php
# application/views/admin/survey/surveySummary_view.php
# application/views/survey/questions/answer/ranking/rows/answer_row.twig
# assets/packages/questions/ranking/scripts/ranking.js
# docs/release_notes.txt
Attach Issues:
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/expressions/em_core_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/replacements_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/third_party/pchart/pData.class.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/survey/questions/answer/ranking/rows/answer_row.twig Diff File
mod - assets/fonts/noto.css Diff File
add - assets/packages/bootstrap/img/loader.gif Diff File
mod - assets/packages/bootstrap/yiistrap.css Diff File
mod - assets/packages/bootstrap/yiistrap.min.css Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js Diff File
mod - docs/release_notes.txt 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/hr/hr.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - themes/survey/vanilla/views/subviews/navigation/question_index_questions_buttons.twig Diff File

master bfd9dd43

2019-01-18 18:22:09

DenisChenu

Details Diff
Dev: typo in language
Attach Issues:
mod - application/models/Question.php Diff File

master c3198cc0

2019-01-18 16:01:09

LouisGac

Details Diff
Fixed issue 14437: Statistics - Clear button not working Affected Issues
14437
mod - application/views/admin/responses/browsemenubar_view.php Diff File

master 6766b1ea

2019-01-18 15:42:07

DenisChenu

Details Diff
Fixed issue 14441: Survey summary invalid values for administrator
Dev: fix views, add Owner and fix Administrator
Affected Issues
14441
mod - application/views/admin/survey/surveySummary_view.php Diff File

newQuestionEdit f241b686

2019-01-17 17:38:09

markusfluer

Details Diff
Dev: question type selector more or less working
Attach Issues:
mod - application/controllers/admin/questionedit.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
mod - application/views/QuestionTypeRenderer/DummyQuestionEditContainer.php Diff File
mod - application/views/QuestionTypeRenderer/RenderArrayDual.php Diff File
mod - application/views/QuestionTypeRenderer/RenderBoilerplate.php Diff File
mod - application/views/QuestionTypeRenderer/RenderDate.php Diff File
mod - application/views/QuestionTypeRenderer/RenderEquation.php Diff File
mod - application/views/QuestionTypeRenderer/RenderFivePointChoice.php Diff File
mod - application/views/QuestionTypeRenderer/RenderFreeText.php Diff File
mod - application/views/QuestionTypeRenderer/RenderLanguageSelector.php Diff File
mod - application/views/QuestionTypeRenderer/RenderListComment.php Diff File
mod - application/views/QuestionTypeRenderer/RenderListDropdown.php Diff File
mod - application/views/QuestionTypeRenderer/RenderListRadio.php Diff File
mod - application/views/QuestionTypeRenderer/RenderMultipleChoice.php Diff File
mod - application/views/QuestionTypeRenderer/RenderMultipleChoiceWithComments.php Diff File
mod - application/views/QuestionTypeRenderer/RenderMultipleNumerical.php Diff File
mod - application/views/QuestionTypeRenderer/RenderMultipleShortText.php Diff File
mod - application/views/QuestionTypeRenderer/RenderRanking.php Diff File
mod - application/views/admin/survey/Question2/_jsVariables.php Diff File
mod - application/views/admin/survey/Question2/view.php Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.css Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.js Diff File
mod - assets/packages/questioneditor/scss/main.scss Diff File
mod - assets/packages/questioneditor/src/App.vue Diff File
mod - assets/packages/questioneditor/src/components/mainEditor.vue Diff File
add - assets/packages/questioneditor/src/mixins/eventChild.js Diff File
mod - assets/packages/questioneditor/src/questioneditmain.js Diff File
mod - assets/packages/questioneditor/src/storage/actions.js Diff File
mod - assets/packages/questioneditor/src/storage/mutations.js Diff File
mod - assets/packages/questioneditor/src/storage/store.js Diff File

master d55bd2a9

2019-01-17 17:13:35

Dominik Vitt

Details Diff
Fixed issue: no "loading" icon on survey list page
Attach Issues:
add - assets/packages/bootstrap/img/loader.gif Diff File
mod - assets/packages/bootstrap/yiistrap.css Diff File
mod - assets/packages/bootstrap/yiistrap.min.css Diff File

develop 8955a40c

2019-01-17 16:47:41

Dominik Vitt

Details Diff
Fixed issue: new localization tables not deleted when deleting survey
Attach Issues:
mod - application/models/Survey.php Diff File

newQuestionEdit 9162e275

2019-01-17 14:52:42

markusfluer

Details Diff
Dev: editing with preview working
Attach Issues:
mod - application/controllers/admin/questionedit.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionBaseRenderer.php Diff File
add - application/views/QuestionTypeRenderer/DummyQuestionEditContainer.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
mod - application/views/admin/survey/Question2/_jsVariables.php Diff File
mod - application/views/admin/survey/Question2/view.php Diff File
add - application/views/survey/questions/answer/dummy/answer.twig 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/src/adminpanelmain.js Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_questionsgroups.vue Diff File
rm - assets/packages/adminpanel/src/main.js Diff File
mod - assets/packages/adminpanel/src/store/vuex-store.js Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.css Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.debug.js Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.js Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.min.css Diff File
mod - assets/packages/questioneditor/build/lsquestioneditor.min.js Diff File
mod - assets/packages/questioneditor/gulpfile.js Diff File
mod - assets/packages/questioneditor/package.json Diff File
mod - assets/packages/questioneditor/scss/main.scss Diff File
add - assets/packages/questioneditor/src/App.vue Diff File
mod - assets/packages/questioneditor/src/components/advancedSettings.vue Diff File
mod - assets/packages/questioneditor/src/components/generalSettings.vue Diff File
mod - assets/packages/questioneditor/src/components/mainEditor.vue Diff File
add - assets/packages/questioneditor/src/components/subcomponents/_answeroptions.vue Diff File
add - assets/packages/questioneditor/src/components/subcomponents/_previewFrame.vue Diff File
add - assets/packages/questioneditor/src/components/subcomponents/_subquestions.vue Diff File
add - assets/packages/questioneditor/src/mixins/debounceCkeditor.js Diff File
mod - assets/packages/questioneditor/src/mixins/runAjax.js Diff File
add - assets/packages/questioneditor/src/modules/serverInterface.js Diff File
mod - assets/packages/questioneditor/src/questioneditmain.js Diff File
mod - assets/packages/questioneditor/src/storage/actions.js Diff File
add - assets/packages/questioneditor/src/storage/getters.js Diff File
mod - assets/packages/questioneditor/src/storage/mutations.js Diff File
mod - assets/packages/questioneditor/src/storage/store.js Diff File
mod - assets/packages/questioneditor/webpack.config.js Diff File
mod - assets/packages/questioneditor/yarn.lock Diff File

master 576c0e84

2019-01-17 14:31:42

Dominik Vitt

Details Diff
Fixed issue 14426: Error exporting PDF with graphs Affected Issues
14426
mod - application/third_party/pchart/pData.class.php Diff File

develop f3142e71

2019-01-16 17:27:25

Dominik Vitt

Details Diff
Fixed issue: wrong display of response filters on statistics page
Attach Issues:
mod - application/controllers/admin/statistics.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File

master 7c67c5bd

2019-01-16 13:27:41

LouisGac

Details Diff
Dev: possible to delete available themes directly from list
Attach Issues:
mod - application/controllers/admin/themes.php Diff File
mod - application/models/TemplateManifest.php Diff File

master fd7471d1

2019-01-16 13:09:15

LouisGac

Details Diff
[security] Fixed issue: possible to delete a broken theme by bait clicking an administrator
Attach Issues:
mod - application/controllers/admin/themes.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File

master 348430c7

2019-01-16 13:05:15

LouisGac

Details Diff
[security] Fixed issue: possible to delete a theme by bait clicking an administrator
Attach Issues:
mod - application/controllers/admin/themes.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File

master 3678472e

2019-01-16 10:52:33

LouisGac

Details Diff
Fixed issue: wrong link to noto italic
Attach Issues:
mod - assets/fonts/noto.css Diff File

master c8c39daa

2019-01-15 16:43:42

markusfluer

Details Diff
Fixed issue: Printanwers not using evaluated question and helptext
Attach Issues:
mod - application/models/SurveyDynamic.php Diff File

master c187069a

2019-01-15 16:39:55

markusfluer

Details Diff
Fixed issue: Slider not always in middle position
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File

master 2b12b68d

2019-01-15 16:08:06

Dominik Vitt

Details Diff
Fixed issue: placeholder fields can't be inserted and expresions validation doesn't work on edit email templates page
Attach Issues:
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/helpers/replacements_helper.php Diff File

master c5f427ba

2019-01-15 10:38:01

c_schmitz

Details Diff
Dev Added more information to 'No invitations sent' error message
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File

master b4caa56e

2019-01-15 09:41:50

DenisChenu

Details Diff
Dev: fixed issue 14427: Option 'Other' switched to Off , view part
Dev: just fix the view to be more clear
Affected Issues
14427
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master 3cb80451

2019-01-15 09:26:46

DenisChenu

Details Diff
Fixed issue 14427: On an Active survey, Option 'Other' switched to Off when update question
Dev: Disable update of Other when survey is activated
Dev: Review order of fixing, and don't fix always 1 to Y, and other to N (since it's a view issue here …)
Dev: remove usage of $_POST update
Affected Issues
14427
mod - application/controllers/admin/database.php Diff File

master 7556952a

2019-01-14 17:33:31

markusfluer

Details Diff
Fixed issue: Printable view containe em function instead of values
Attach Issues:
mod - application/models/SurveyDynamic.php Diff File

develop b10eb8be

2019-01-14 15:12:52

Dominik Vitt

Details Diff
Fixed issue: errors on response statistics page
Attach Issues:
mod - application/models/Answer.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 301 302 303 304 305 306 307 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1452 1453 1454  Next  Last