Changesets: LimeSurvey
|
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 | ||
|
develop 6765edbb 2016-11-14 18:27 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 18:18
Details Diff |
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 17:20
Details Diff |
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 17:19
Details Diff |
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 17:16
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 17:16
Details Diff |
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 16:13 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 14:29 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 14:07 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 09:47 Details Diff |
Dev: scrutinizer partial (leave 2 uneeded var) | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
develop b7a114ab 2016-11-13 20:30 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 | ||
|
develop 46d46eb4 2016-11-13 19:36 Details Diff |
Dev: review dynamic with slider HTML |
Affected Issues 11883 |
|
| mod - application/core/packages/limesurvey/survey.css | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/answer.php | Diff File | ||
| add - application/views/survey/questions/multiplenumeric/rows/dynamic_slider.php | Diff File | ||
| mod - templates/default/css/template-core.css | Diff File | ||
|
develop 1378bac5 2016-11-13 11:37 Details Diff |
Dev: Remove some uneeded var, review some var | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
|
develop 9b6d7ba8 2016-11-12 20:42 Details Diff |
Dev: print template reviewing | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - styles-public/printable.css | Diff File | ||
| rm - templates/default/css/print_template-rtl.css | Diff | ||
| mod - templates/default/css/print_template.css | Diff File | ||
| mod - templates/default/views/print_question.pstpl | Diff File | ||
| mod - templates/default/views/print_survey.pstpl | Diff File | ||
|
develop 74fe595d 2016-11-12 13:08 Details Diff |
Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey into develop | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
develop e22b9819 2016-11-12 13:06 Details Diff |
Dev issue #11885: Review "print survey" Dev: This we must use qanda-helper for all question here (select/option must be reset to list) Dev: or Question Object must return a printview when we have one |
||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| add - styles-public/printable.css | Diff File | ||
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/default/css/print_template.css | Diff File | ||
| mod - templates/default/views/print_group.pstpl | Diff File | ||
| mod - templates/default/views/print_question.pstpl | Diff File | ||
| mod - templates/default/views/print_survey.pstpl | Diff File | ||
|
fancytree_new b6b66523 2016-11-11 15:29
Details Diff |
Merge remote-tracking branch 'refs/remotes/origin/fancytree_new' Conflicts: application/config/version.php application/models/Question.php docs/release_notes.txt locale/_template/limesurvey.pot locale/pt-BR/pt-BR.mo |
||
|
develop e12c9319 2016-11-11 14:31 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
master d811cb2c 2016-11-11 14:30 Details Diff |
Dev: notice when init KC finder | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
develop 3de1ed7f 2016-11-11 14:08 Details Diff |
Dev: 11808 : show warning for survey manager when using a 'old' template Dev: API is an integer (3 actually) Dev: move apiVersion to private : don't think a plugin must be allowed to update it ? |
Affected Issues 11808 |
|
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
develop b4a0b4ca 2016-11-11 13:33 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop # Conflicts: # application/config/version.php |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.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/cs/cs.mo | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/it-informal/it-informal.mo | Diff File | ||
| mod - locale/it/it.mo | Diff File | ||
| mod - locale/nb/nb.mo | Diff File | ||
| mod - locale/nl-informal/nl-informal.mo | Diff File | ||
| mod - locale/nl/nl.mo | Diff File | ||
| mod - locale/nn/nn.mo | Diff File | ||
| mod - locale/pl/pl.mo | Diff File | ||
| mod - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - locale/sv/sv.mo | Diff File | ||
|
master 99ba9302 2016-11-11 13:18 Details Diff |
Release 2.55.3 Build 161111 | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 32d85fdd 2016-11-11 13:18 Details Diff |
Release 2.55.3 Build 161111 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
