DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -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/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
This commit is contained in:
snipe 2022-05-18 13:37:31 -07:00
parent 5f187f71c8 f14a4d3bc7
commit 937472feb0
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -15624,9 +15624,9 @@
}
},
"jquery": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"jquery-form-validator": {
"version": "2.3.79",

2
package.json
View file

@ -16,7 +16,7 @@
"@fortawesome/fontawesome-free": "^5.15.4",
"axios": "^0.20.0",
"babel-preset-latest": "^6.24.1",
"jquery": "^3.6.0",
"jquery": "<3.6.0",
"laravel-mix": "^6.0.39",
"lodash": "^4.17.20",
"postcss": "^8.4.5",

BIN
public/js/build/app.js
View file

Binary file not shown.

BIN
public/js/build/app.js.LICENSE.txt
View file

Binary file not shown.

BIN
public/js/build/vendor.js
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{
"/js/build/app.js": "/js/build/app.js?id=9101318eb8888221d3bc",
"/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=73366b2d1a77d1ba880e",
"/css/build/overrides.css": "/css/build/overrides.css?id=21281fb933786f40e97c",
"/css/build/app.css": "/css/build/app.css?id=a05de1e55dcc50ddba9a",
@ -24,9 +24,9 @@
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=e45be9555cc66bf80749",
"/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c",
"/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f3",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=8b909f5a1792dcc78a4b",
"/js/dist/all.js": "/js/dist/all.js?id=9d3b5857f74d9ae93c76",
"/js/dist/all.js": "/js/dist/all.js?id=e25ec49ad10591b90f1a",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=f140a248b0153fa42a1e",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=f46ff1c860ae9e87d484",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=89fcb616f2b14565cfd3",