LimeSurvey: develop 4ecf3855

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2016-11-16 23:39:42 develop e404dd11
Changeset

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 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
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