Changesets: LimeSurvey
|
develop a7f12216 2018-05-29 13:52:45 Details Diff |
Merge branch 'master' into develop Conflicts: application/helpers/replacements_helper.php |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - assets/packages/expressions/em_javascript.js | Diff File | ||
| mod - assets/packages/limesurvey/survey.js | Diff File | ||
| add - tests/data/surveys/limesurvey_survey_351443.lss | Diff File | ||
| add - tests/surveys/AutoCalcTest.php | Diff File | ||
| mod - themes/survey/vanilla/scripts/theme.js | Diff File | ||
| mod - themes/survey/vanilla/views/subviews/survey/question_subviews/survey_question_help.twig | Diff File | ||
|
master 42dee241 2018-05-29 13:48:21 Details Diff |
Dev: Add unit test for auto-calc EM | ||
| add - tests/data/surveys/limesurvey_survey_351443.lss | Diff File | ||
| add - tests/surveys/AutoCalcTest.php | Diff File | ||
|
master 74eaf566 2018-05-29 12:08:20
|
Fixed issue 13712: Exclusive option does not exclude others |
Affected Issues 13712 |
|
| mod - assets/packages/limesurvey/survey.js | Diff File | ||
|
master a042113f 2018-05-29 11:20:16 Details Diff |
Fixed issue: Several database update problems when updating from 1.91 | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 83caffef 2018-05-29 11:18:06
|
Fixed issue 13710: Media File in Question Group description is not displayed when taking survey if there is no proper text in description |
Affected Issues 13710 |
|
| mod - themes/survey/vanilla/scripts/theme.js | Diff File | ||
|
master 9701c9b6 2018-05-29 10:26:21 Details Diff |
Dev: Re-throw updatedb helper exception if debug is on | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master 478aa762 2018-05-28 18:54:36
|
Fixed issue 13574: Some placeholders no longer available in 3.x |
Affected Issues 13574 |
|
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master 43a3248a 2018-05-28 18:53:05
|
Fixed issue 13574: Some placeholders no longer available in 3.x |
Affected Issues 13574 |
|
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master 4e85c01f 2018-05-28 18:37:55
|
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 17:51:48
|
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 17:05:12
|
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 16:36:24 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 15:15:58 gekkedev Committer: |
FIX: endless redirections in theme setting menu (#1080) | ||
| mod - application/controllers/admin/themeoptions.php | Diff File | ||
|
master 91b646d6 2018-05-28 10:59:40 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 10:56:23 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 19:51:35 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 16:24:19 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 16:21:18 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 16:21:15 Details Diff |
Dev: Indentation in UploadController | ||
| mod - application/controllers/UploaderController.php | Diff File | ||
|
develop 99e11b88 2018-05-25 16:21:01 Details Diff |
Dev: Missing null in PHPDoc | ||
| mod - framework/db/ar/CActiveRecord.php | Diff File | ||
|
master fa236596 2018-05-25 15:17:23 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 11:20:38 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 11:00:26 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 10:22:44 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 09:01:55
|
Fixed issue: PHP7 not creating folders automatically on copy | ||
| mod - application/models/TemplateManifest.php | Diff File | ||
