DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
This commit is contained in:
snipe 2023-12-15 13:58:25 +00:00
parent 0bb5abd24d 2427cb787b
commit 61a1fed0a2
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package-lock.json generated
View file

@ -15890,11 +15890,6 @@
"jquery": ">=1.8.0 <4.0.0"
}
},
"jquery-ui-bundle": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz",
"integrity": "sha512-GHaOlAemudaYqrBzaU0XutgC/vBwcvd+SBQ+TtUTA+dLx4PiVQAfTm3ABrh+JzhV6PZBOk8AIhsC9l+XggpldQ=="
},
"jquery.iframe-transport": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/jquery.iframe-transport/-/jquery.iframe-transport-1.0.0.tgz",

1
package.json
View file

@ -44,7 +44,6 @@
"jquery-form-validator": "^2.3.79",
"jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.13.2",
"jquery-ui-bundle": "^1.12.1",
"jquery.iframe-transport": "^1.0.0",
"jspdf-autotable": "^3.7.1",
"less": "^4.2.0",

3
webpack.mix.js
View file

@ -17,7 +17,6 @@ mix
"./node_modules/bootstrap/dist/css/bootstrap.css",
"./node_modules/@fortawesome/fontawesome-free/css/all.css",
"./public/css/build/AdminLTE.css",
"./node_modules/jquery-ui-bundle/jquery-ui.css",
"./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css",
"./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
"./node_modules/blueimp-file-upload/css/jquery.fileupload.css",
@ -159,7 +158,7 @@ mix.combine(
"./node_modules/select2/dist/js/select2.full.min.js",
"./node_modules/admin-lte/dist/js/adminlte.min.js",
"./node_modules/tether/dist/js/tether.js",
"./node_modules/jquery-ui-bundle/jquery-ui.js",
"./node_modules/jquery-ui/dist/jquery-ui.js",
"./node_modules/jquery-slimscroll/jquery.slimscroll.js",
"./node_modules/jquery.iframe-transport/jquery.iframe-transport.js",
"./node_modules/blueimp-file-upload/js/jquery.fileupload.js",