Ugggh… fixing a donked merge

2024-12-24 21:24:13 -08:00 · 2020-04-21 03:30:21 -07:00 · 2020-04-21 03:30:21 -07:00 · b670371e0b
parent f532e9b462
commit b670371e0b
471 changed files with 47 additions and 48 deletions
--- a/public/js/FileSaver.min.js
+++ b/public/js/FileSaver.min.js
--- a/public/js/app.min.js
+++ b/public/js/app.min.js
--- a/public/js/bootstrap-table-locale-all.js
+++ b/public/js/bootstrap-table-locale-all.js
--- a/public/js/bootstrap-table-locale-all.min.js
+++ b/public/js/bootstrap-table-locale-all.min.js
--- a/public/js/bootstrap-table.css
+++ b/public/js/bootstrap-table.css
--- a/public/js/bootstrap-table.min.css
+++ b/public/js/bootstrap-table.min.css
--- a/public/js/bootstrap-table.min.js
+++ b/public/js/bootstrap-table.min.js
--- a/public/js/bootstrap.datepicker.js
+++ b/public/js/bootstrap.datepicker.js
--- a/public/js/bootstrap/css/bootstrap.css
+++ b/public/js/bootstrap/css/bootstrap.css
--- a/public/js/bootstrap/css/bootstrap.css.map
+++ b/public/js/bootstrap/css/bootstrap.css.map
--- a/public/js/bootstrap/css/bootstrap.min.css
+++ b/public/js/bootstrap/css/bootstrap.min.css
--- a/public/js/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/public/js/bootstrap/fonts/glyphicons-halflings-regular.eot
--- a/public/js/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/public/js/bootstrap/fonts/glyphicons-halflings-regular.svg
--- a/public/js/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/public/js/bootstrap/fonts/glyphicons-halflings-regular.ttf
--- a/public/js/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/public/js/bootstrap/fonts/glyphicons-halflings-regular.woff
--- a/public/js/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/public/js/bootstrap/fonts/glyphicons-halflings-regular.woff2
--- a/public/js/bootstrap/js/npm.js
+++ b/public/js/bootstrap/js/npm.js
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
--- a/public/js/dashboard2.js
+++ b/public/js/dashboard2.js
--- a/public/js/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js
+++ b/public/js/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js
--- a/public/js/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js
+++ b/public/js/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js
--- a/public/js/extensions/angular/bootstrap-table-angular.js
+++ b/public/js/extensions/angular/bootstrap-table-angular.js
--- a/public/js/extensions/angular/bootstrap-table-angular.min.js
+++ b/public/js/extensions/angular/bootstrap-table-angular.min.js
--- a/public/js/extensions/cookie/bootstrap-table-cookie.js
+++ b/public/js/extensions/cookie/bootstrap-table-cookie.js
--- a/public/js/extensions/cookie/bootstrap-table-cookie.min.js
+++ b/public/js/extensions/cookie/bootstrap-table-cookie.min.js
--- a/public/js/extensions/editable/bootstrap-table-editable.js
+++ b/public/js/extensions/editable/bootstrap-table-editable.js
--- a/public/js/extensions/editable/bootstrap-table-editable.min.js
+++ b/public/js/extensions/editable/bootstrap-table-editable.min.js
--- a/public/js/extensions/export/bootstrap-table-export.min.js
+++ b/public/js/extensions/export/bootstrap-table-export.min.js
--- a/public/js/extensions/export/jquery.base64.js
+++ b/public/js/extensions/export/jquery.base64.js
--- a/public/js/extensions/export/tableExport.js
+++ b/public/js/extensions/export/tableExport.js
--- a/public/js/extensions/export/tableExport.min.js
+++ b/public/js/extensions/export/tableExport.min.js
--- a/public/js/extensions/filter-control/bootstrap-table-filter-control.js
+++ b/public/js/extensions/filter-control/bootstrap-table-filter-control.js
--- a/public/js/extensions/filter-control/bootstrap-table-filter-control.min.js
+++ b/public/js/extensions/filter-control/bootstrap-table-filter-control.min.js
--- a/public/js/extensions/filter/bootstrap-table-filter.js
+++ b/public/js/extensions/filter/bootstrap-table-filter.js
--- a/public/js/extensions/filter/bootstrap-table-filter.min.js
+++ b/public/js/extensions/filter/bootstrap-table-filter.min.js
--- a/public/js/extensions/flat-json/bootstrap-table-flat-json.js
+++ b/public/js/extensions/flat-json/bootstrap-table-flat-json.js
--- a/public/js/extensions/flat-json/bootstrap-table-flat-json.min.js
+++ b/public/js/extensions/flat-json/bootstrap-table-flat-json.min.js
--- a/public/js/extensions/group-by-v2/bootstrap-table-group-by.css
+++ b/public/js/extensions/group-by-v2/bootstrap-table-group-by.css
--- a/public/js/extensions/group-by-v2/bootstrap-table-group-by.js
+++ b/public/js/extensions/group-by-v2/bootstrap-table-group-by.js
--- a/public/js/extensions/group-by-v2/bootstrap-table-group-by.min.js
+++ b/public/js/extensions/group-by-v2/bootstrap-table-group-by.min.js
--- a/public/js/extensions/group-by/bootstrap-table-group-by.css
+++ b/public/js/extensions/group-by/bootstrap-table-group-by.css
--- a/public/js/extensions/group-by/bootstrap-table-group-by.js
+++ b/public/js/extensions/group-by/bootstrap-table-group-by.js
--- a/public/js/extensions/group-by/bootstrap-table-group-by.min.js
+++ b/public/js/extensions/group-by/bootstrap-table-group-by.min.js
--- a/public/js/extensions/key-events/bootstrap-table-key-events.js
+++ b/public/js/extensions/key-events/bootstrap-table-key-events.js
--- a/public/js/extensions/key-events/bootstrap-table-key-events.min.js
+++ b/public/js/extensions/key-events/bootstrap-table-key-events.min.js
--- a/public/js/extensions/mobile/bootstrap-table-mobile.js
+++ b/public/js/extensions/mobile/bootstrap-table-mobile.js
--- a/public/js/extensions/mobile/bootstrap-table-mobile.min.js
+++ b/public/js/extensions/mobile/bootstrap-table-mobile.min.js
--- a/public/js/extensions/multiple-search/bootstrap-table-multiple-search.js
+++ b/public/js/extensions/multiple-search/bootstrap-table-multiple-search.js
--- a/public/js/extensions/multiple-search/bootstrap-table-multiple-search.min.js
+++ b/public/js/extensions/multiple-search/bootstrap-table-multiple-search.min.js
--- a/public/js/extensions/natural-sorting/bootstrap-table-natural-sorting.js
+++ b/public/js/extensions/natural-sorting/bootstrap-table-natural-sorting.js
--- a/public/js/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js
+++ b/public/js/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js
--- a/public/js/extensions/reorder-columns/bootstrap-table-reorder-columns.js
+++ b/public/js/extensions/reorder-columns/bootstrap-table-reorder-columns.js
--- a/public/js/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js
+++ b/public/js/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js
--- a/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.css
+++ b/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.css
--- a/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.js
+++ b/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.js
--- a/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js
+++ b/public/js/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js
--- a/public/js/extensions/resizable/bootstrap-table-resizable.js
+++ b/public/js/extensions/resizable/bootstrap-table-resizable.js
--- a/public/js/extensions/resizable/bootstrap-table-resizable.min.js
+++ b/public/js/extensions/resizable/bootstrap-table-resizable.min.js
--- a/public/js/extensions/sticky-header/bootstrap-table-sticky-header.css
+++ b/public/js/extensions/sticky-header/bootstrap-table-sticky-header.css
--- a/public/js/extensions/sticky-header/bootstrap-table-sticky-header.js
+++ b/public/js/extensions/sticky-header/bootstrap-table-sticky-header.js
--- a/public/js/extensions/sticky-header/bootstrap-table-sticky-header.min.js
+++ b/public/js/extensions/sticky-header/bootstrap-table-sticky-header.min.js
--- a/public/js/extensions/toolbar/bootstrap-table-toolbar.js
+++ b/public/js/extensions/toolbar/bootstrap-table-toolbar.js
--- a/public/js/html5.js
+++ b/public/js/html5.js
--- a/public/js/html5shiv.js
+++ b/public/js/html5shiv.js
--- a/public/js/jquery.dragtable.js
+++ b/public/js/jquery.dragtable.js
--- a/public/js/jquery.fileupload.js
+++ b/public/js/jquery.fileupload.js
--- a/public/js/jquery.iframe-transport.js
+++ b/public/js/jquery.iframe-transport.js
--- a/public/js/jquery.js
+++ b/public/js/jquery.js
--- a/public/js/jquery.typeahead.min.js
+++ b/public/js/jquery.typeahead.min.js
--- a/public/js/jquery.ui.widget.js
+++ b/public/js/jquery.ui.widget.js
--- a/public/js/jspdf.min.js
+++ b/public/js/jspdf.min.js
--- a/public/js/jspdf.plugin.autotable.js
+++ b/public/js/jspdf.plugin.autotable.js
--- a/public/js/locale/bootstrap-table-af-ZA.js
+++ b/public/js/locale/bootstrap-table-af-ZA.js
--- a/public/js/locale/bootstrap-table-af-ZA.min.js
+++ b/public/js/locale/bootstrap-table-af-ZA.min.js
--- a/public/js/locale/bootstrap-table-ar-SA.js
+++ b/public/js/locale/bootstrap-table-ar-SA.js
--- a/public/js/locale/bootstrap-table-ar-SA.min.js
+++ b/public/js/locale/bootstrap-table-ar-SA.min.js
--- a/public/js/locale/bootstrap-table-ca-ES.js
+++ b/public/js/locale/bootstrap-table-ca-ES.js
--- a/public/js/locale/bootstrap-table-ca-ES.min.js
+++ b/public/js/locale/bootstrap-table-ca-ES.min.js
--- a/public/js/locale/bootstrap-table-cs-CZ.js
+++ b/public/js/locale/bootstrap-table-cs-CZ.js
--- a/public/js/locale/bootstrap-table-cs-CZ.min.js
+++ b/public/js/locale/bootstrap-table-cs-CZ.min.js
--- a/public/js/locale/bootstrap-table-da-DK.js
+++ b/public/js/locale/bootstrap-table-da-DK.js
--- a/public/js/locale/bootstrap-table-da-DK.min.js
+++ b/public/js/locale/bootstrap-table-da-DK.min.js
--- a/public/js/locale/bootstrap-table-de-DE.js
+++ b/public/js/locale/bootstrap-table-de-DE.js
--- a/public/js/locale/bootstrap-table-de-DE.min.js
+++ b/public/js/locale/bootstrap-table-de-DE.min.js
--- a/public/js/locale/bootstrap-table-el-GR.js
+++ b/public/js/locale/bootstrap-table-el-GR.js
--- a/public/js/locale/bootstrap-table-el-GR.min.js
+++ b/public/js/locale/bootstrap-table-el-GR.min.js
--- a/public/js/locale/bootstrap-table-en-US.js
+++ b/public/js/locale/bootstrap-table-en-US.js
--- a/public/js/locale/bootstrap-table-en-US.min.js
+++ b/public/js/locale/bootstrap-table-en-US.min.js
--- a/public/js/locale/bootstrap-table-es-AR.js
+++ b/public/js/locale/bootstrap-table-es-AR.js
--- a/public/js/locale/bootstrap-table-es-AR.min.js
+++ b/public/js/locale/bootstrap-table-es-AR.min.js
--- a/public/js/locale/bootstrap-table-es-CR.js
+++ b/public/js/locale/bootstrap-table-es-CR.js
--- a/public/js/locale/bootstrap-table-es-CR.min.js
+++ b/public/js/locale/bootstrap-table-es-CR.min.js
--- a/public/js/locale/bootstrap-table-es-ES.js
+++ b/public/js/locale/bootstrap-table-es-ES.js
--- a/public/js/locale/bootstrap-table-es-ES.min.js
+++ b/public/js/locale/bootstrap-table-es-ES.min.js
--- a/public/js/locale/bootstrap-table-es-MX.js
+++ b/public/js/locale/bootstrap-table-es-MX.js
--- a/public/js/locale/bootstrap-table-es-MX.min.js
+++ b/public/js/locale/bootstrap-table-es-MX.min.js
--- a/public/js/locale/bootstrap-table-es-NI.js
+++ b/public/js/locale/bootstrap-table-es-NI.js
--- a/public/js/locale/bootstrap-table-es-NI.min.js
+++ b/public/js/locale/bootstrap-table-es-NI.min.js
--- a/public/js/locale/bootstrap-table-es-SP.js
+++ b/public/js/locale/bootstrap-table-es-SP.js
--- a/public/js/locale/bootstrap-table-es-SP.min.js
+++ b/public/js/locale/bootstrap-table-es-SP.min.js
--- a/Show more
+++ b/Show more