Changesets: LimeSurvey
|
master f9df8048 2016-10-12 16:47:46 Details Diff |
Dev: Factor out shouldShowScenario() | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/views/admin/conditions/includes/form_editconditions_header.php | Diff File | ||
|
master ddb40cbb 2016-10-12 16:34:30 Details Diff |
Dev: Removed unused variables and make sure all variables are defined before use | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
|
master fe56c59d 2016-10-12 16:34:27 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - scripts/star-rating.js | Diff File | ||
|
master 3bb2c265 2016-10-12 16:33:03
|
Fixed issue 11752: mandatory radio star show 4 stars only |
Affected Issues 11752 |
|
| mod - scripts/star-rating.js | Diff File | ||
|
master 23fd3ed0 2016-10-12 16:09:36 Details Diff |
Dev: Replace _POST access with Yii request | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
|
master 91fd44d7 2016-10-12 15:45:58 Details Diff |
Dev: Throw exception if query fails (should never happen) | ||
| mod - application/models/Condition.php | Diff File | ||
|
2.06lts 60338d84 2016-10-12 15:18:29 Details Diff |
Fixed issue 11772: Expression manager convert_value does not obey strict setting |
Affected Issues 11772 |
|
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
2.06lts b66df555 2016-10-12 15:17:32 Details Diff |
Dev: Ignore vim undo files | ||
| mod - .gitignore | Diff File | ||
|
master a919ee72 2016-10-12 15:13:20 Details Diff |
Fixed issue 11772: Expression manager convert_value does not obey strict setting |
Affected Issues 11772 |
|
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
answers_html-mergedMaster fd6532d3 2016-10-12 14:39:38 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html-mergedMaster Dev: keep gender already fixed. Must review star (but wait if it's included in 2.5 or not) # Conflicts: # application/views/survey/questions/gender/buttons/answer.php # application/views/survey/questions/gender/radio/answer.php |
||
| mod - application/controllers/UploaderController.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - scripts/star-rating.js | Diff File | ||
| mod - styles-public/star-rating.css | Diff File | ||
|
master 6b833b31 2016-10-12 14:29:34 Details Diff |
Merge branch 'cond' | ||
| mod - application/controllers/admin/conditionsaction.php | Diff File | ||
| mod - application/models/Condition.php | Diff File | ||
| mod - application/views/admin/conditions/conditionshead_view.php | Diff File | ||
| mod - application/views/admin/conditions/conditionslist_view.php | Diff File | ||
| add - application/views/admin/conditions/deleteAllConditions.php | Diff File | ||
| add - application/views/admin/conditions/includes/condition.php | Diff File | ||
| mod - application/views/admin/conditions/includes/conditions_edit.php | Diff File | ||
| mod - application/views/admin/conditions/includes/conditions_scenario.php | Diff File | ||
| add - application/views/admin/conditions/includes/copyform.php | Diff File | ||
| mod - application/views/admin/conditions/includes/form_editconditions_header.php | Diff File | ||
| add - application/views/admin/conditions/includes/navigator.php | Diff File | ||
| mod - application/views/admin/survey/Question/questionbar_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/conditions.js | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
|
master 6241d029 2016-10-12 14:27:27 Details Diff |
Dev: Make sure $inputnames is defined before use | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
master b4a05edc 2016-10-12 14:03:49 Details Diff |
Dev: Remove unused variables | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
master f6f52bef 2016-10-12 13:03:17 Details Diff |
Fixed issue #11775: Gender question condition faulty |
Affected Issues 11775 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/gender/buttons/answer.php | Diff File | ||
| mod - application/views/survey/questions/gender/radio/answer.php | Diff File | ||
|
master 292c9dc7 2016-10-12 12:03:34 Details Diff |
Fixed issue 11785: Warn if input is too big in question organizer |
Affected Issues 11785 |
|
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
|
cond 87f46d96 2016-10-12 10:58:17 Details Diff |
Dev: Fix regexp tab in condition designer | ||
| mod - application/views/admin/conditions/includes/form_editconditions_header.php | Diff File | ||
| mod - scripts/admin/conditions.js | Diff File | ||
|
master 8caf54f1 2016-10-12 10:16:33 Details Diff |
Fixed issue 11780: Typo - The file has been successfuly uploaded |
Affected Issues 11780 |
|
| mod - application/controllers/UploaderController.php | Diff File | ||
|
answers_html-mergedMaster 35fd06eb 2016-10-12 01:01:35 Details Diff |
Merge branch 'answers_html' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html-mergedMaster | ||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/views/survey/questions/ranking/answer.php | Diff File | ||
| add - application/views/survey/system/actionButton/saveLoad.php | Diff File | ||
| add - application/views/survey/system/actionButton/saveSave.php | Diff File | ||
| add - application/views/survey/system/actionLink/saveLoad.php | Diff File | ||
| add - application/views/survey/system/actionLink/saveSave.php | Diff File | ||
| mod - templates/default/scripts/template.js | Diff File | ||
|
answers_html f2b923e1 2016-10-12 00:55:26 Details Diff |
Dev: Fixed issue 11755: Default action for saveall/loadall Dev: remove button before ready if not usable (usabe only i form#limesurvey is here) Dev: don't need button, but need javascript Dev: function can be replaced in template (leave some core class) |
Affected Issues 11755 |
|
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| add - application/views/survey/system/actionButton/saveLoad.php | Diff File | ||
| add - application/views/survey/system/actionButton/saveSave.php | Diff File | ||
| add - application/views/survey/system/actionLink/saveLoad.php | Diff File | ||
| add - application/views/survey/system/actionLink/saveSave.php | Diff File | ||
| mod - templates/default/scripts/template.js | Diff File | ||
|
answers_html d38306bf 2016-10-11 23:15:10 Details Diff |
Dev: div not closed in ranking question type (Tammo ter Hark) | ||
| mod - application/views/survey/questions/ranking/answer.php | Diff File | ||
|
master a4f468cc 2016-10-11 19:23:29
|
Dev: stars now using fa and heavily commented | ||
| mod - scripts/star-rating.js | Diff File | ||
| mod - styles-public/star-rating.css | Diff File | ||
|
cond 2db450d2 2016-10-11 18:19:01 Details Diff |
Dev: Style and-or-or condition better | ||
| mod - application/views/admin/conditions/includes/condition.php | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
|
cond 84989c95 2016-10-11 18:03:01 Details Diff |
Dev: Fix data-tooltip | ||
| mod - application/views/admin/conditions/includes/conditions_scenario.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
|
cond 7282c84f 2016-10-11 18:00:57 Details Diff |
Merge remote-tracking branch 'origin/master' into cond | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
| mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
| mod - application/views/admin/token/browse.php | Diff File | ||
| mod - scripts/admin/listresponse.js | Diff File | ||
| mod - scripts/admin/tokens.js | Diff File | ||
|
cond e61d12e6 2016-10-11 18:00:52 Details Diff |
Dev: Replace radio buttons with tabs in condition edit form | ||
| mod - application/views/admin/conditions/includes/form_editconditions_header.php | Diff File | ||
| mod - scripts/admin/conditions.js | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
| mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
