Changesets: LimeSurvey
master b17221a7 2016-11-17 11:27
Details Diff |
Fixed issue 11906: Сan not see the quota name when you select an answer for quota |
Affected Issues 11906 |
|
mod - application/controllers/admin/quotas.php | Diff File | ||
master cc4e9cf4 2016-11-17 11:27
Details Diff |
Dev: Fix for not activating plugins | ||
mod - application/views/admin/pluginmanager/index.php | Diff File | ||
develop 67580f25 2016-11-17 02:04 Details Diff |
Dev: config.xml of default | ||
mod - templates/default/config.xml | Diff File | ||
develop 3998d61c 2016-11-17 01:56 Details Diff |
Dev: move fontawesome to depend of survey package (removed only from layout) Dev: little issue with ranking Dev: create core package question-ranking see #06753 Dev: remove uneeded jqueryui from default template |
||
mod - application/config/packages.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
add - application/core/packages/questions/ranking/ranking.css | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
mod - application/views/survey/questions/ranking/answer.php | Diff File | ||
rm - styles-public/ranking.css | Diff | ||
mod - templates/default/config.xml | Diff File | ||
develop a278accc 2016-11-17 01:13 Details Diff |
Dev: issue #11783: remove SUBMITBUTTON SUBMITCOMPLETE SUBMITREVIEW | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
develop cd8244b7 2016-11-17 01:03 Details Diff |
Dev: Fix (partial : public part only) merging issue Dev: #11918 : remove jqueryui from template config.xml, add it to do_ranking Dev: create config/packages.php for core packages |
||
mod - application/config/internal.php | Diff File | ||
add - application/config/packages.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - templates/default/config.xml | Diff File | ||
develop 4ecf3855 2016-11-17 00:39 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop Dev: more lerging than i can control # Conflicts: # application/config/third_party.php # application/controllers/admin/database.php # application/controllers/admin/questions.php # scripts/admin/surveysettings.js |
||
mod - application/config/internal.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/participantsaction.php | Diff File | ||
mod - application/controllers/admin/questions.php | Diff File | ||
mod - application/controllers/admin/quotas.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/controllers/admin/templates.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/core/plugins/Authdb/Authdb.php | Diff File | ||
mod - application/extensions/PannelBoxWidget/views/box.php | Diff File | ||
mod - application/extensions/PannelBoxWidget/views/row_header.php | Diff File | ||
mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
mod - application/models/Participant.php | Diff File | ||
mod - application/models/SurveyURLParameter.php | Diff File | ||
mod - application/views/admin/authentication/forgotpassword.php | Diff File | ||
mod - application/views/admin/authentication/login.php | Diff File | ||
mod - application/views/admin/dataentry/vvimport.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_outputoptions.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
mod - application/views/admin/responses/browseidrow_view.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_integration_panel.php | Diff File | ||
mod - application/views/admin/survey/surveySummary_view.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 - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-colors.css | 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/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-colors.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/Bay_of_Many/scripts/sidemenu.js | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-colors.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/Black_Pearl/scripts/sidemenu.js | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-colors.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/Dark_Sky/scripts/sidemenu.js | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-colors.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/Free_Magenta/scripts/sidemenu.js | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-colors.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/Noto_All_Languages/scripts/sidemenu.js | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-colors.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/Purple_Tentacle/scripts/sidemenu.js | Diff File | ||
mod - styles/Sea_Green/config.xml | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.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/Sea_Green/scripts/sidemenu.js | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-colors.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 | ||
mod - styles/Sunset_Orange/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 | ||
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 | ||
2.06lts 069aef6a 2016-11-16 18:51 Details Diff |
[release] 1.1.1 date question type with only time are not saved | ||
mod - CHANGELOG.md | Diff File | ||
2.06lts bfe8f116 2016-11-16 18:48 Details Diff |
[fix] Minor issue with leaflet (z-index) | ||
mod - styles-public/map.css | Diff File | ||
master 06dd9885 2016-11-16 18:29
Details Diff |
Fixed issue 11906: Сan not see the quota name when you select an answer for quota |
Affected Issues 11906 |
|
mod - application/controllers/admin/quotas.php | Diff File | ||
mod - application/views/admin/quotas/newanswertwo_view.php | Diff File | ||
2.06lts 3d21d662 2016-11-16 18:19 Details Diff |
Merge branch '2.06lts' of https://github.com/LimeSurvey/LimeSurvey.git into 2.06_SondagesPro # Conflicts: # application/config/version.php # scripts/map.js |
||
mod - .gitignore | Diff File | ||
mod - CHANGELOG.md | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
mod - application/libraries/Date_Time_Converter.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/map.js | Diff File | ||
master 4a3ebd11 2016-11-16 17:57
Details Diff |
Fixed issue 11906: Сan not see the quota name when you select an answer for quota |
Affected Issues 11906 |
|
mod - application/views/admin/quotas/newanswertwo_view.php | Diff File | ||
master 460f9cb1 2016-11-16 17:36
Details Diff |
Fixed issue 11585: VV export/import dialogs are not styled |
Affected Issues 11585 |
|
mod - application/views/admin/dataentry/vvimport.php | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
master 3405e9b2 2016-11-16 16:59
Details Diff |
Dev: redesigned input file with-form control. | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
master 80e79ac5 2016-11-16 15:45
Details Diff |
Dev: apply changes to all admin themes | ||
mod - styles/Apple_Blossom/css/lime-admin-colors.css | 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-colors.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/Bay_of_Many/scripts/sidemenu.js | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-colors.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/Black_Pearl/scripts/sidemenu.js | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-colors.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/Dark_Sky/scripts/sidemenu.js | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-colors.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/Free_Magenta/scripts/sidemenu.js | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-colors.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/Noto_All_Languages/scripts/sidemenu.js | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-colors.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/Purple_Tentacle/scripts/sidemenu.js | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.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-colors.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 | ||
mod - styles/Sunset_Orange/scripts/sidemenu.js | Diff File | ||
master 88339f9c 2016-11-16 15:21
Details Diff |
Fixed issue: boxes on home page and quick actions don't have the same height on small screens. | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
master 1f244c92 2016-11-16 13:59
Details Diff |
Dev: boxes alignments | ||
mod - application/extensions/PannelBoxWidget/views/box.php | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
master 783126c1 2016-11-16 13:30
Details Diff |
Dev: quick actions boxes ratios | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
master 877f6f23 2016-11-16 12:50
Details Diff |
Dev: Welcome page boxes, width/height ratios | ||
mod - application/extensions/PannelBoxWidget/views/row_header.php | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
master 8b667cff 2016-11-16 12:32
Details Diff |
Dev: error alert for wrong login | ||
mod - application/controllers/admin/authentication.php | Diff File | ||
master afd614ce 2016-11-16 11:45
Details Diff |
Fixed issue 10324: CSS on login page needs fixing Dev: forgot password screen |
Affected Issues 10324 |
|
mod - application/views/admin/authentication/forgotpassword.php | Diff File | ||
master 09a759b3 2016-11-16 11:24
Details Diff |
Fixed issue #11913: Cross-site scripting vulnerability in Version 2.55.2+161103 | ||
mod - application/controllers/admin/templates.php | Diff File | ||
master 49aff574 2016-11-16 10:54
Details Diff |
Fixed issue 11849: Numeric valid item with , show as error |
Affected Issues 11849 |
|
mod - application/controllers/admin/questions.php | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
master edb93cf7 2016-11-15 21:00
Details Diff |
New feature 11741: Login limesurvey using the email address |
Affected Issues 11741 |
|
mod - application/core/plugins/Authdb/Authdb.php | Diff File | ||
mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
master 3085e0a9 2016-11-15 20:05
Details Diff |
fixed issue 11847: Don't move all template in asset directory (views not needed) |
Affected Issues 11847 |
|
mod - application/config/internal.php | Diff File |