Changesets: LimeSurvey
|
master 4e85c01f 2018-05-28 20:37
Details Diff |
Fixed issue 12950: Regression? {ASSESSMENT_CURRENT_TOTAL} no longer defined |
Affected Issues 12950 |
|
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master a9daeeab 2018-05-28 19:51
Details Diff |
Fixed issue: equation question only dependant on another equation question not reevaluated | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - assets/scripts/expressions/em_javascript.js | Diff File | ||
|
master cffd334d 2018-05-28 19:05
Details Diff |
Fixed issue: question help hidden with only script tag in it | ||
| mod - themes/survey/vanilla/views/subviews/survey/question_subviews/survey_question_help.twig | Diff File | ||
|
develop 7243b0cb 2018-05-28 18:36 Details Diff |
Merge branch 'master' into develop | ||
| mod - application/controllers/admin/themeoptions.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/models/QuotaLanguageSetting.php | Diff File | ||
|
master 950a9010 2018-05-28 17:15 gekkedev
Committer: Details Diff |
FIX: endless redirections in theme setting menu (#1080) | ||
| mod - application/controllers/admin/themeoptions.php | Diff File | ||
|
master 91b646d6 2018-05-28 12:59 Dominik Vitt Details Diff |
Fixed issue 12227: "Error: Failed to insert data" and corrupted quotas when i've tried to import old (v2.5.xx) surveys |
Affected Issues 12227 |
|
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/models/QuotaLanguageSetting.php | Diff File | ||
|
develop e81ef6b7 2018-05-28 12:56 Details Diff |
Merge branch 'master' into develop | ||
| mod - plugins/Demo/Example/Example.php | Diff File | ||
| mod - plugins/Demo/ShowResponse/ShowResponse.php | Diff File | ||
| mod - plugins/Demo/UnActivatable/UnActivatable.php | Diff File | ||
|
master c8a30e18 2018-05-26 21:51 Details Diff |
Fixed issue : demo plugin broke page Dev: removing all function not working for Example Dev: removing broken setting list |
||
| mod - plugins/Demo/Example/Example.php | Diff File | ||
| mod - plugins/Demo/ShowResponse/ShowResponse.php | Diff File | ||
| mod - plugins/Demo/UnActivatable/UnActivatable.php | Diff File | ||
|
develop 6e00c0b2 2018-05-25 18:24 Committer: ollehar1 Details Diff |
DEV: implement QuestionType (#1066) * DEV: add QuestionType * DEV: add QuestionType - getters * DEV: add Field * DEV: add StaticModel * DEV: add QuestionType::modelsAttributes() * DEV: fix attributeNames() * DEV: getQuestionType for Question * DEV: rename textCodes * DEV: clean up Field * DEV: PHPdoc * DEV: Fix Static __construct() |
||
| add - application/core/StaticModel.php | Diff File | ||
| add - application/models/Field.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| add - application/models/QuestionType.php | Diff File | ||
|
develop eec564dc 2018-05-25 18:21 Details Diff |
Merge branch 'master' into develop | ||
| mod - application/models/SurveysGroups.php | Diff File | ||
| mod - application/views/admin/surveysgroups/_form.php | Diff File | ||
|
develop deb023a8 2018-05-25 18:21 Details Diff |
Dev: Indentation in UploadController | ||
| mod - application/controllers/UploaderController.php | Diff File | ||
|
develop 99e11b88 2018-05-25 18:21 Details Diff |
Dev: Missing null in PHPDoc | ||
| mod - framework/db/ar/CActiveRecord.php | Diff File | ||
|
master fa236596 2018-05-25 17:17 Dominik Vitt Details Diff |
Fixed issue 13598: Missing filter when selecting parent survey group |
Affected Issues 13598 |
|
| mod - application/models/SurveysGroups.php | Diff File | ||
| mod - application/views/admin/surveysgroups/_form.php | Diff File | ||
|
develop 61cdbac8 2018-05-25 13:20 Details Diff |
Dev: Missing questionHelper use | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
develop 35f71469 2018-05-25 13:00 Details Diff |
Dev: Clean up merge problems | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/models/QuestionAttribute.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
develop 4caa8b88 2018-05-25 12:22 Details Diff |
Merge branch 'master' into develop Conflicts: application/controllers/admin/questions.php |
||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/models/TemplateManifest.php | Diff File | ||
| mod - application/third_party/gtranslate-api/GTranslate.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
master 0abd142f 2018-05-25 11:01
Details Diff |
Fixed issue: PHP7 not creating folders automatically on copy | ||
| mod - application/models/TemplateManifest.php | Diff File | ||
|
master 1a4b965d 2018-05-24 19:15 Dominik Vitt Details Diff |
Fixed issue 13645: Error message Google Translate API | ||
| mod - application/third_party/gtranslate-api/GTranslate.php | Diff File | ||
|
master c166461c 2018-05-24 19:12 Dominik Vitt Details Diff |
Dev: New corrections of question theme selection on edit question page | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
develop 42d8df4a 2018-05-24 18:16 Details Diff |
Merge branch 'master' into develop Conflicts: application/config/version.php application/controllers/admin/questions.php application/helpers/admin/statistics_helper.php application/views/admin/survey/Question/editQuestion_view.php |
||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/helpers/userstatistics_helper.php | Diff File | ||
| mod - application/models/QuestionTemplate.php | Diff File | ||
| mod - application/views/admin/export/generatestats/_statisticsoutput_header.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | 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/hu/hu.mo | Diff File | ||
| mod - locale/ja/ja.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 - tests/TestHelper.php | Diff File | ||
|
master 0668e183 2018-05-24 17:59 Details Diff |
Release 3.8.1+180524 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master fcc3f9b2 2018-05-24 17:41 Details Diff |
Dev: Don't use date in tests screenshots | ||
| mod - tests/TestHelper.php | Diff File | ||
|
master ba13820a 2018-05-24 17:18 Dominik Vitt Details Diff |
Dev: Corrections of question theme selection on edit question page | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/models/QuestionTemplate.php | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
master a009d48e 2018-05-24 17:00 Details Diff |
Dev: Apply statistics fix to user statistics | ||
| mod - application/helpers/userstatistics_helper.php | Diff File | ||
|
master 4d5ed420 2018-05-24 15:00 Details Diff |
Fixed issue: Move subquestion text to top in statistics | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
