gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
This commit is contained in:
snipe
2026-01-05 20:20:51 +00:00
parent e67c5273d7 812ff0bfd2
commit 134491b59e
6 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
package-lock.json generated
View File

@@ -26,7 +26,7 @@
"jquery-ui": "^1.14.1",
"jquery-validation": "^1.21.0",
"jquery.iframe-transport": "^1.0.0",
"jspdf": "^3.0.3",
"jspdf": ">=4.0.0",
"jspdf-autotable": "^5.0.2",
"less": "^4.2.2",
"less-loader": "^6.0",
@@ -1742,9 +1742,10 @@
"license": "MIT"
},
"node_modules/@babel/runtime": {
"version": "7.28.2",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
"integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
"version": "7.28.4",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
"integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
"license": "MIT",
"engines": {
"node": ">=6.9.0"
}
@@ -6798,12 +6799,12 @@
}
},
"node_modules/jspdf": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/jspdf/-/jspdf-3.0.3.tgz",
"integrity": "sha512-eURjAyz5iX1H8BOYAfzvdPfIKK53V7mCpBTe7Kb16PaM8JSXEcUQNBQaiWMI8wY5RvNOPj4GccMjTlfwRBd+oQ==",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/jspdf/-/jspdf-4.0.0.tgz",
"integrity": "sha512-w12U97Z6edKd2tXDn3LzTLg7C7QLJlx0BPfM3ecjK2BckUl9/81vZ+r5gK4/3KQdhAcEZhENUxRhtgYBj75MqQ==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.26.9",
"@babel/runtime": "^7.28.4",
"fast-png": "^6.2.0",
"fflate": "^0.8.1"
},

2
package.json
View File

@@ -46,7 +46,7 @@
"jquery-ui": "^1.14.1",
"jquery-validation": "^1.21.0",
"jquery.iframe-transport": "^1.0.0",
"jspdf": "^3.0.3",
"jspdf": ">=4.0.0",
"jspdf-autotable": "^5.0.2",
"less": "^4.2.2",
"less-loader": "^6.0",

2
public/js/dist/all.js vendored
View File

File diff suppressed because one or more lines are too long

20
public/js/dist/all.js.LICENSE.txt vendored
View File

@@ -28,6 +28,17 @@
* https://github.com/select2/select2/blob/master/LICENSE.md
*/
/*!
* Sizzle CSS Selector Engine v2.3.5
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
*/
/*!
* clipboard.js v2.0.11
* https://clipboardjs.com/
@@ -36,14 +47,17 @@
*/
/*!
* jQuery JavaScript Library v3.7.1
* jQuery JavaScript Library v3.5.1
* https://jquery.com/
*
* Copyright OpenJS Foundation and other contributors
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2023-08-28T13:37Z
* Date: 2020-05-04T22:49Z
*/
/*!

2
public/js/dist/all.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@@ -1,5 +1,5 @@
{
"/js/dist/all.js": "/js/dist/all.js?id=2dd258bb47be82b0a9237c513bddf2d1",
"/js/dist/all.js": "/js/dist/all.js?id=eaf7be52c739b83e9282d20981db0a07",
"/css/build/overrides.css": "/css/build/overrides.css?id=955f1204631dbea12cd1b6cdf5c12b50",
"/css/build/app.css": "/css/build/app.css?id=92f5873bc1425b14b040c51ad53db7a3",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",