Changesets: LimeSurvey
|
master e874baa5 2016-11-15 19:14
Details Diff |
Fixed issue 11814: Graphics options are all turned on Dev: typecasting in output options |
Affected Issues 11814 |
|
| mod - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
|
master 0c2df789 2016-11-15 19:07
Details Diff |
Fixed issue 11814: Graphics options are all turned on; Dev: type cast in data selection |
Affected Issues 11814 |
|
| mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
|
master 73939614 2016-11-15 18:40
Details Diff |
Fixed issue 11695: When using file questions all possible files are shown, even empty ones |
Affected Issues 11695 |
|
| mod - application/views/admin/responses/browseidrow_view.php | Diff File | ||
|
master 70169967 2016-11-15 18:19
Details Diff |
Fixed issue 10324: CSS on login page needs fixing |
Affected Issues 10324 |
|
| mod - application/views/admin/authentication/login.php | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
|
develop e404dd11 2016-11-15 15:58 Committer: GitHub Details Diff |
Merge pull request #587 from tammoterhark/develop Dev: some smaller margins for collapsed arrays on mobile. |
||
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/default/css/template-core.css | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
|
develop c2fc2fc6 2016-11-15 15:12 Details Diff |
Dev: typing errors in comments corrected | ||
| mod - templates/default/config.xml | Diff File | ||
|
develop 3ef6b2c7 2016-11-15 14:56 Details Diff |
Dev: decreasing space for collapsed arrays when on mobile | ||
| mod - templates/default/css/template.css | Diff File | ||
|
develop 6d5de20f 2016-11-15 14:18 Details Diff |
Dev: correct some typing errors Boostrap -> Bootstrap |
||
| mod - templates/default/css/template-core.css | Diff File | ||
|
master 47b3a96f 2016-11-15 13:51
Details Diff |
Merged branch master into master | ||
|
master ae726f60 2016-11-15 13:50
Details Diff |
Merged branch master into master | ||
|
master c4caa4cf 2016-11-15 13:50
Details Diff |
Dev: Merged local devBranch | ||
|
master d818febe 2016-11-15 13:49
Details Diff |
Dev: removed dev methods | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
master 9c748541 2016-11-15 13:48
Details Diff |
Dev: recreated some vital methods | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
|
master 9296731c 2016-11-15 12:48
Details Diff |
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 | ||
| rm - third_party/jqgrid/css/ui.jqgrid.css | Diff | ||
| rm - third_party/jqgrid/js/Changes.txt | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ar.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-bg.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-bg1251.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cat.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cn.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-cs.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-da.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-de.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-dk.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-el.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-en.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-es.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fa.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fi.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-fr.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-gl.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-he.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hr.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hr1250.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-hu.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-id.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-is.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-it.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ja.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-kr.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-lt.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-mne.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-nl.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-no.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pl.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pt-br.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-pt.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ro.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ru.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sk.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sr-latin.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sr.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-sv.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-th.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-tr.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-tw.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-ua.js | Diff | ||
| rm - third_party/jqgrid/js/i18n/grid.locale-vi.js | Diff | ||
| rm - third_party/jqgrid/js/install.txt | Diff | ||
| rm - third_party/jqgrid/js/jquery-1.9.0.min.js | Diff | ||
| rm - third_party/jqgrid/js/jquery.jqGrid.min.js | Diff | ||
| rm - third_party/jqgrid/js/jquery.jqGrid.src.js | Diff | ||
| rm - third_party/jqgrid/plugins/grid.addons.js | Diff | ||
| rm - third_party/jqgrid/plugins/grid.postext.js | Diff | ||
| rm - third_party/jqgrid/plugins/grid.setcolumns.js | Diff | ||
| rm - third_party/jqgrid/plugins/jquery.contextmenu.js | Diff | ||
| rm - third_party/jqgrid/plugins/jquery.searchFilter.js | Diff | ||
| rm - third_party/jqgrid/plugins/jquery.tablednd.js | Diff | ||
| rm - third_party/jqgrid/plugins/searchFilter.css | Diff | ||
| rm - third_party/jqgrid/plugins/ui.multiselect.css | Diff | ||
| rm - third_party/jqgrid/plugins/ui.multiselect.js | Diff | ||
|
master 7ebf12ac 2016-11-15 12:36
Details Diff |
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 09:09 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 09:07 Details Diff |
Dev: set defaultWidth for do_array_5point | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop f9f398ba 2016-11-15 02:05 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 | ||
| 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 20:25 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 19:57 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 19:45 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 19:29 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 19:00 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 18:54 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 18:43 Details Diff |
Dev: fixed issue copy question bug in develop version |
Affected Issues 11892 |
|
| mod - application/controllers/admin/database.php | Diff File | ||
