Changesets: LimeSurvey
|
master d818febe 2016-11-15 12:49:45
|
Dev: removed dev methods | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
master 9c748541 2016-11-15 12:48:19
|
Dev: recreated some vital methods | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
master 9296731c 2016-11-15 11:48:25
|
Dev: Removed JQgrid completely | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/models/Participant.php | Diff File | ||
| mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
| mod - application/views/admin/token/browse.php | Diff File | ||
| mod - scripts/admin/attributeControl.js | Diff File | ||
| mod - scripts/admin/participantdisplay.js | Diff File | ||
| mod - scripts/admin/sharePanel.js | Diff File | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
| mod - scripts/admin/tokens.js | Diff File | ||
| mod - styles/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
| mod - styles/Sea_Green/config.xml | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
| rm - third_party/jqgrid/css/ellipsis-xbl.xml | Diff File | ||
| rm - third_party/jqgrid/css/ui.jqgrid.css | Diff File | ||
| rm - third_party/jqgrid/js/Changes.txt | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ar.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-bg.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-bg1251.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cat.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cn.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cs.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-da.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-de.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-dk.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-el.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-en.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-es.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fa.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fi.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fr.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-gl.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-he.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hr.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hr1250.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hu.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-id.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-is.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-it.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ja.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-kr.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-lt.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-mne.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-nl.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-no.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pl.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pt-br.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pt.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ro.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ru.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sk.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sr-latin.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sr.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sv.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-th.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-tr.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-tw.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ua.js | Diff File | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-vi.js | Diff File | ||
| rm - third_party/jqgrid/js/install.txt | Diff File | ||
| rm - third_party/jqgrid/js/jquery-1.9.0.min.js | Diff File | ||
| rm - third_party/jqgrid/js/jquery.jqGrid.min.js | Diff File | ||
| rm - third_party/jqgrid/js/jquery.jqGrid.src.js | Diff File | ||
| rm - third_party/jqgrid/plugins/grid.addons.js | Diff File | ||
| rm - third_party/jqgrid/plugins/grid.postext.js | Diff File | ||
| rm - third_party/jqgrid/plugins/grid.setcolumns.js | Diff File | ||
| rm - third_party/jqgrid/plugins/jquery.contextmenu.js | Diff File | ||
| rm - third_party/jqgrid/plugins/jquery.searchFilter.js | Diff File | ||
| rm - third_party/jqgrid/plugins/jquery.tablednd.js | Diff File | ||
| rm - third_party/jqgrid/plugins/searchFilter.css | Diff File | ||
| rm - third_party/jqgrid/plugins/ui.multiselect.css | Diff File | ||
| rm - third_party/jqgrid/plugins/ui.multiselect.js | Diff File | ||
|
master 7ebf12ac 2016-11-15 11:36:39
|
Dev: datatable working. Not ajaxed right now. still to come | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
develop 2dbfa84b 2016-11-15 08:09:53 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop | ||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
|
develop 634f9894 2016-11-15 08:07:16 Details Diff |
Dev: set defaultWidth for do_array_5point | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop f9f398ba 2016-11-15 01:05:59 Details Diff |
Dev: issue 11907: Cell class of "No answer" cell lack of noanswer-item Dev: all question views are different : must review before twig Dev: but must take decision about solution: echo/renderPartial in renderPartial (with foreach) Dev: unsure for the global directory solution, can help , but hard to find Dev: fix some other issue with | as separator |
Affected Issues 11907 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/arrays/10point/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/10point/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/10point/rows/cells/answer_td_input.php | Diff File | ||
| mod - application/views/survey/questions/arrays/5point/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/5point/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/5point/rows/cells/answer_td_answertext.php | Diff File | ||
| rm - application/views/survey/questions/arrays/5point/rows/cells/thead.php | Diff File | ||
| mod - application/views/survey/questions/arrays/array/dropdown/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/array/no_dropdown/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/array/no_dropdown/rows/cells/answer_td.php | Diff File | ||
| mod - application/views/survey/questions/arrays/dualscale/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/dualscale/answer_header.php | Diff File | ||
| mod - application/views/survey/questions/arrays/increasesamedecrease/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/increasesamedecrease/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/increasesamedecrease/rows/cells/thead.php | Diff File | ||
| mod - application/views/survey/questions/arrays/yesnouncertain/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/yesnouncertain/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/yesnouncertain/rows/cells/thead.php | Diff File | ||
| add - application/views/survey/questions/global/table/cell/head-information.php | Diff File | ||
|
develop 6e62e996 2016-11-14 19:25:20 Details Diff |
Dev: more height for input in cell : no need to update to/bottom padding Dev: leave BS padding |
||
| mod - templates/default/css/template-core.css | Diff File | ||
|
develop ad8d6a0b 2016-11-14 18:57:52 Details Diff |
Dev: issue 11903: Bad alignment of repeated headers Dev: please : question type information :) |
Affected Issues 11903 |
|
| mod - application/views/survey/questions/arrays/10point/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/5point/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/multiflexi/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/multiflexi/rows/repeat_header.php | Diff File | ||
| mod - application/views/survey/questions/arrays/texts/rows/repeat_header.php | Diff File | ||
|
develop f6b7a714 2016-11-14 18:45:25 Details Diff |
Dev: column count in dual scale : fix header |
Affected Issues 10103 |
|
| mod - application/views/survey/questions/arrays/dualscale/answer_header.php | Diff File | ||
|
develop 0d7843ac 2016-11-14 18:29:38 Details Diff |
Dev: 10103 some id in double + some space between attribute Dev: Currently : in demo survey : col count VS th count in array dual need fix |
Affected Issues 10103 |
|
| mod - application/views/survey/questions/5pointchoice/rows/item_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/10point/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/arrays/5point/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/list_dropdown/rows/option.php | Diff File | ||
| mod - application/views/survey/questions/list_with_comment/list/rows/answer_row.php | Diff File | ||
| mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php | Diff File | ||
|
develop 3ee885eb 2016-11-14 18:00:51 Details Diff |
Dev: see on 11904 : th are not 'block' |
Affected Issues 11904 |
|
| mod - templates/default/css/template-core.css | Diff File | ||
|
develop 5bd2764e 2016-11-14 17:54:14 Details Diff |
Dev: issue 11902: Array dual scale: 2 x no answer Dev: the now answer header is for no-js |
Affected Issues 11902 |
|
| mod - application/views/survey/questions/arrays/dualscale/answer_header.php | Diff File | ||
|
develop 77544419 2016-11-14 17:43:40 Details Diff |
Dev: fixed issue copy question bug in develop version |
Affected Issues 11892 |
|
| mod - application/controllers/admin/database.php | Diff File | ||
|
develop 6765edbb 2016-11-14 17:27:12 Details Diff |
Dev: update date/time : with debug=0 maybe | ||
| mod - scripts/numeric-slider.js | Diff File | ||
| mod - templates/default/config.xml | Diff File | ||
|
master bc90ac08 2016-11-14 17:18:25
|
Dev: In between commit to check against woring solution | ||
| mod - application/models/SurveyURLParameter.php | Diff File | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
master 9c67651d 2016-11-14 16:20:18
|
Dev: in between commit removing jqgrid from third party and first running datatable | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
| mod - scripts/admin/attributeControl.js | Diff File | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
| mod - styles/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
|
master 629896c3 2016-11-14 16:19:24
|
Dev: added DataTables to remove JQgrid | ||
| mod - application/config/third_party.php | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.bootstrap.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.bootstrap.min.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.foundation.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.foundation.min.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.jqueryui.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.jqueryui.min.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables.min.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables_themeroller.css | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_asc.png | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_asc_disabled.png | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_both.png | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_desc.png | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/images/sort_desc_disabled.png | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.bootstrap.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.bootstrap.min.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.foundation.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.foundation.min.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.jqueryui.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.jqueryui.min.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/jquery.dataTables.js | Diff File | ||
| add - third_party/jquery-datatable/DataTables-1.10.12/js/jquery.dataTables.min.js | Diff File | ||
| add - third_party/jquery-datatable/datatables.css | Diff File | ||
| add - third_party/jquery-datatable/datatables.js | Diff File | ||
| add - third_party/jquery-datatable/datatables.min.css | Diff File | ||
| add - third_party/jquery-datatable/datatables.min.js | Diff File | ||
|
master 5b64be69 2016-11-14 16:16:04
Committer: GitHub Details Diff |
Fixed issue 11901: Unable to update Decimal mark |
Affected Issues 11901 |
|
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
|
master 29b42125 2016-11-14 16:16:04
|
Fixed issue 11901: Unable to update Decimal mark |
Affected Issues 11901 |
|
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
|
develop cb3ec7b7 2016-11-14 15:13:05 Details Diff |
Dev: fixed issue 11900: Fatal error in demosurvey Dev: sid not sessid ... Dev: answer_width_bycolumn not answer_width (for array by column) |
Affected Issues 11900 |
|
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop e7cfb97e 2016-11-14 13:29:44 Details Diff |
Fixed issue 11850: Some slider settings broken when min value is negative or 0 Dev: already don ein parent, but update partially js |
Affected Issues 11850 |
|
| mod - scripts/numeric-slider.js | Diff File | ||
|
develop 39ad1176 2016-11-14 13:07:58 Details Diff |
Fixed issue 11732: Slider reset don't reset to default position New feature : slider_default can set or not the value Dev: must do more test with , for radix, but 11849 |
Affected Issues 11732, 11850 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/helpers/questionHelper.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
| mod - scripts/numeric-slider.js | Diff File | ||
|
develop f8f75093 2016-11-14 08:47:47 Details Diff |
Dev: scrutinizer partial (leave 2 uneeded var) | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop b7a114ab 2016-11-13 19:30:37 Details Diff |
Dev: issue 11864 leaved default width even if have right/center part Dev: issue 11865 Dual Scale Answer text separator for radio |
Affected Issues 11864, 11865 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/arrays/dualscale/answer.php | Diff File | ||
| mod - application/views/survey/questions/arrays/dualscale/answer_header.php | Diff File | ||
| mod - templates/default/css/template-core.css | Diff File | ||
| mod - templates/default/views/clearall.pstpl | Diff File | ||
