DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

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

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
This commit is contained in:
snipe 2022-05-06 01:52:43 -07:00
parent 2e03270fca 6304709c77
commit 784bf4d784
12 changed files with 100 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View file

@ -445,8 +445,6 @@ class LoginController extends Controller
return redirect()->away($sloRequestUrl); return redirect()->away($sloRequestUrl);
} }
$request->session()->regenerate(true);
$request->session()->regenerate(true); $request->session()->regenerate(true);
Auth::logout(); Auth::logout();

188
package-lock.json generated
View file

@ -1842,13 +1842,9 @@
"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
}, },
"adler-32": { "adler-32": {
"version": "1.2.0", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz", "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
"integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=", "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
"requires": {
"exit-on-epipe": "~1.0.1",
"printj": "~1.1.0"
}
}, },
"admin-lte": { "admin-lte": {
"version": "2.4.18", "version": "2.4.18",
@ -2790,9 +2786,9 @@
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
}, },
"base64-arraybuffer": { "base64-arraybuffer": {
"version": "0.2.0", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz", "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
"integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==" "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
}, },
"base64-js": { "base64-js": {
"version": "1.5.1", "version": "1.5.1",
@ -2942,9 +2938,9 @@
"integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8=" "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
}, },
"bootstrap-table": { "bootstrap-table": {
"version": "1.18.3", "version": "1.20.0",
"resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.18.3.tgz", "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.20.0.tgz",
"integrity": "sha512-/eFLkldDlNFi37qC/d9THfRVxMUGD34E8fQBFtXJLDHLBOVKWDTq7BV+udoP7k3FfCEyhM1jWQnQ0rMQdBv//w==" "integrity": "sha512-e6lOTG44aAeSFuOqFSjuMakXUlVF2jSkgtlDqa2lXbwq/Hn3Sn4TMSSJgSKdMnwX8WOpdlF3DIGUKQLiQ9vlXA=="
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
@ -3375,9 +3371,9 @@
"integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw==" "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw=="
}, },
"canvg": { "canvg": {
"version": "3.0.9", "version": "3.0.10",
"resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.9.tgz", "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
"integrity": "sha512-rDXcnRPuz4QHoCilMeoTxql+fvGqNAxp+qV/KHD8rOiJSAfVjFclbdUNHD2Uqfthr+VMg17bD2bVuk6F07oLGw==", "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
"optional": true, "optional": true,
"requires": { "requires": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
@ -3391,9 +3387,9 @@
}, },
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "3.20.1", "version": "3.22.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz",
"integrity": "sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg==", "integrity": "sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==",
"optional": true "optional": true
}, },
"regenerator-runtime": { "regenerator-runtime": {
@ -3405,35 +3401,12 @@
} }
}, },
"cfb": { "cfb": {
"version": "1.2.1", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz", "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
"integrity": "sha512-wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ==", "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
"requires": { "requires": {
"adler-32": "~1.3.0", "adler-32": "~1.3.0",
"crc-32": "~1.2.0", "crc-32": "~1.2.0"
"printj": "~1.3.0"
},
"dependencies": {
"adler-32": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz",
"integrity": "sha512-f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==",
"requires": {
"printj": "~1.2.2"
},
"dependencies": {
"printj": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz",
"integrity": "sha512-sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="
}
}
},
"printj": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz",
"integrity": "sha512-017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="
}
} }
}, },
"chalk": { "chalk": {
@ -3907,13 +3880,9 @@
} }
}, },
"crc-32": { "crc-32": {
"version": "1.2.0", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
"integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==", "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
"requires": {
"exit-on-epipe": "~1.0.1",
"printj": "~1.1.0"
}
}, },
"create-ecdh": { "create-ecdh": {
"version": "4.0.4", "version": "4.0.4",
@ -4006,11 +3975,11 @@
} }
}, },
"css-line-break": { "css-line-break": {
"version": "2.0.1", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz", "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
"integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==", "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
"requires": { "requires": {
"base64-arraybuffer": "^0.2.0" "utrie": "^1.0.2"
} }
}, },
"css-loader": { "css-loader": {
@ -4487,9 +4456,9 @@
} }
}, },
"dompurify": { "dompurify": {
"version": "2.3.4", "version": "2.3.6",
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz", "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz",
"integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==", "integrity": "sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==",
"optional": true "optional": true
}, },
"domutils": { "domutils": {
@ -4671,13 +4640,13 @@
} }
}, },
"es5-ext": { "es5-ext": {
"version": "0.10.53", "version": "0.10.61",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==",
"requires": { "requires": {
"es6-iterator": "~2.0.3", "es6-iterator": "^2.0.3",
"es6-symbol": "~3.1.3", "es6-symbol": "^3.1.3",
"next-tick": "~1.0.0" "next-tick": "^1.1.0"
} }
}, },
"es6-iterator": { "es6-iterator": {
@ -4880,11 +4849,6 @@
} }
} }
}, },
"exit-on-epipe": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
"integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
},
"express": { "express": {
"version": "4.17.2", "version": "4.17.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz", "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
@ -4946,9 +4910,9 @@
}, },
"dependencies": { "dependencies": {
"type": { "type": {
"version": "2.5.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
"integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==" "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="
} }
} }
}, },
@ -15016,12 +14980,12 @@
} }
}, },
"html2canvas": { "html2canvas": {
"version": "1.3.3", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.3.tgz", "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
"integrity": "sha512-nQi0ayEY1cMiUMbq/F5hRwMAqsRMo7NIP6VaCqaXnXO6b/FfZO49oSfIJjdyRha28EuY8D6FBCzQOXPQV0TCrA==", "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
"requires": { "requires": {
"css-line-break": "2.0.1", "css-line-break": "^2.1.0",
"text-segmentation": "^1.0.2" "text-segmentation": "^1.0.3"
} }
}, },
"htmlescape": { "htmlescape": {
@ -15773,9 +15737,9 @@
"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
}, },
"jspdf": { "jspdf": {
"version": "2.5.0", "version": "2.5.1",
"resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.0.tgz", "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.1.tgz",
"integrity": "sha512-XT0E2m8A9P1xl7ItA2OUbmhokzbDQEyZEdWQZD2olADiTiBEZGDRiK1J1zWxBRUG2KezQJOZq//GYZTkvEZuJg==", "integrity": "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==",
"requires": { "requires": {
"@babel/runtime": "^7.14.0", "@babel/runtime": "^7.14.0",
"atob": "^2.1.2", "atob": "^2.1.2",
@ -15788,9 +15752,9 @@
}, },
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "3.20.1", "version": "3.22.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz",
"integrity": "sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg==", "integrity": "sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==",
"optional": true "optional": true
} }
} }
@ -16715,9 +16679,9 @@
"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
}, },
"next-tick": { "next-tick": {
"version": "1.0.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
}, },
"no-case": { "no-case": {
"version": "3.0.4", "version": "3.0.4",
@ -18020,11 +17984,6 @@
"integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==", "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
"dev": true "dev": true
}, },
"printj": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
"integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
},
"private": { "private": {
"version": "0.1.8", "version": "0.1.8",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@ -19192,13 +19151,13 @@
} }
}, },
"tableexport.jquery.plugin": { "tableexport.jquery.plugin": {
"version": "1.21.0", "version": "1.25.0",
"resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.21.0.tgz", "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.25.0.tgz",
"integrity": "sha512-oCI9hn3XY7fKEepsL5IZbGhkT43pyWM6jE44PY0IwFJYGwhacKKxG1QhremY9CkCvUBaZ+Ks+FhBjA2qnS2uQg==", "integrity": "sha512-+9dpFTZ2toqQJ0l+Rfoc3eW1ZMBgqvdK3ie+sDgCHRGnT5r/tZf2ZRyhoiHzRAvdLyoY283oJyVD/HCkwCzhlA==",
"requires": { "requires": {
"file-saver": ">=2.0.1", "file-saver": ">=2.0.1",
"html2canvas": ">=1.0.0", "html2canvas": ">=1.0.0",
"jquery": ">=1.9.1", "jquery": ">=3.2.1",
"jspdf": ">=2.0.0", "jspdf": ">=2.0.0",
"pdfmake": "^0.1.71", "pdfmake": "^0.1.71",
"xlsx": ">=0.16.0" "xlsx": ">=0.16.0"
@ -19271,11 +19230,11 @@
"integrity": "sha1-1WqBhZDY/nLjh/d6Z/k6uW2OH7I=" "integrity": "sha1-1WqBhZDY/nLjh/d6Z/k6uW2OH7I="
}, },
"text-segmentation": { "text-segmentation": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz", "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
"integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==", "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
"requires": { "requires": {
"utrie": "^1.0.1" "utrie": "^1.0.2"
} }
}, },
"through": { "through": {
@ -19575,18 +19534,11 @@
"dev": true "dev": true
}, },
"utrie": { "utrie": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz", "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
"integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==", "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
"requires": { "requires": {
"base64-arraybuffer": "^1.0.1" "base64-arraybuffer": "^1.0.2"
},
"dependencies": {
"base64-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
"integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
}
} }
}, },
"uuid": { "uuid": {
@ -20114,14 +20066,14 @@
"dev": true "dev": true
}, },
"xlsx": { "xlsx": {
"version": "0.17.4", "version": "0.18.5",
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.4.tgz", "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
"integrity": "sha512-9aKt8g9ZLP0CUdBX8L5xnoMDFwSiLI997eQnDThCaqQMYB9AEBIRzblSSNN/ICMGLYIHUO3VKaItcedZJ3ijIg==", "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
"requires": { "requires": {
"adler-32": "~1.2.0", "adler-32": "~1.3.0",
"cfb": "^1.1.4", "cfb": "~1.2.1",
"codepage": "~1.15.0", "codepage": "~1.15.0",
"crc-32": "~1.2.0", "crc-32": "~1.2.1",
"ssf": "~0.11.2", "ssf": "~0.11.2",
"wmf": "~1.0.1", "wmf": "~1.0.1",
"word": "~0.3.0" "word": "~0.3.0"

4
package.json
View file

@ -34,7 +34,7 @@
"bootstrap-colorpicker": "^2.5.3", "bootstrap-colorpicker": "^2.5.3",
"bootstrap-datepicker": "^1.9.0", "bootstrap-datepicker": "^1.9.0",
"bootstrap-less": "^3.3.8", "bootstrap-less": "^3.3.8",
"bootstrap-table": "1.18.x", "bootstrap-table": "1.20.0",
"chart.js": "^2.9.4", "chart.js": "^2.9.4",
"css-loader": "^3.6.0", "css-loader": "^3.6.0",
"ekko-lightbox": "^5.1.1", "ekko-lightbox": "^5.1.1",
@ -53,7 +53,7 @@
"papaparse": "^4.3.3", "papaparse": "^4.3.3",
"select2": "4.0.13", "select2": "4.0.13",
"sheetjs": "^2.0.0", "sheetjs": "^2.0.0",
"tableexport.jquery.plugin": "^1.21.0", "tableexport.jquery.plugin": "1.25.0",
"tether": "^1.4.0", "tether": "^1.4.0",
"vue-resource": "^1.5.2", "vue-resource": "^1.5.2",
"webpack": "^5.65.0" "webpack": "^5.65.0"

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

Binary file not shown.

BIN
public/css/dist/bootstrap-table.css vendored
View file

Binary file not shown.

BIN
public/js/dist/bootstrap-table.js vendored
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -18,14 +18,14 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=8184148eee63ebe2f13c", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=8184148eee63ebe2f13c",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=77bd8e92475ecddc9c62", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=77bd8e92475ecddc9c62",
"/css/dist/all.css": "/css/dist/all.css?id=48ba7a3676a05fcbcccf", "/css/dist/all.css": "/css/dist/all.css?id=6f5411354ef775df6745",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", "/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/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e", "/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=651427cc4b45d8e68d0c",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=e9c259d610ce143ccac3", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=1abc4b83dde9d862bac7",
"/js/dist/all.js": "/js/dist/all.js?id=034ef5d34102944f6768", "/js/dist/all.js": "/js/dist/all.js?id=034ef5d34102944f6768",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=8184148eee63ebe2f13c", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=8184148eee63ebe2f13c",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=55b303cf739c4c07a5a4", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=55b303cf739c4c07a5a4",

1
resources/lang/en/general.php
View file

@ -229,6 +229,7 @@
'show_current' => 'Show Current', 'show_current' => 'Show Current',
'sign_in' => 'Sign in', 'sign_in' => 'Sign in',
'signature' => 'Signature', 'signature' => 'Signature',
'signed_off_by' => 'Signed Off By',
'skin' => 'Skin', 'skin' => 'Skin',
'slack_msg_note' => 'A slack message will be sent', 'slack_msg_note' => 'A slack message will be sent',
'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!', 'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',

6
resources/views/layouts/default.blade.php
View file

@ -15,9 +15,9 @@
<link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : '/img/logo.png' }}"> <link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : config('app.url').'/img/logo.png' }}">
<link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : '/img/logo.png' }}"> <link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->logo)) : config('app.url').'/img/logo.png' }}">
<link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->favicon)) : '/favicon.ico' }} "> <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }} ">
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">

2
resources/views/models/view.blade.php
View file

@ -74,7 +74,7 @@
data-url="{{ route('api.assets.index',['model_id'=> $model->id]) }}" data-url="{{ route('api.assets.index',['model_id'=> $model->id]) }}"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-export-options='{ data-export-options='{
"fileName": "export-models-{{ $model->name }}-assets-{{ date('Y-m-d') }}", "fileName": "export-models-{{ str_slug($model->name) }}-assets-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'> }'>
</table> </table>

10
resources/views/users/print.blade.php
View file

@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Assigned to {{ $show_user->present()->fullName() }}</title> <title>Assigned to {{ $show_user->present()->fullName() }}</title>
@ -174,7 +174,7 @@
<th style="width: 20px;"></th> <th style="width: 20px;"></th>
<th style="width: 40%;">{{ trans('general.name') }}</th> <th style="width: 40%;">{{ trans('general.name') }}</th>
<th style="width: 50%;">{{ trans('general.category') }}</th> <th style="width: 50%;">{{ trans('general.category') }}</th>
<th style="width: 10%;">{{ trans('general.checked_out') }}</th> <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
</tr> </tr>
</thead> </thead>
@php @php
@ -210,7 +210,7 @@
<th style="width: 20px;"></th> <th style="width: 20px;"></th>
<th style="width: 40%;">{{ trans('general.name') }}</th> <th style="width: 40%;">{{ trans('general.name') }}</th>
<th style="width: 50%;">{{ trans('general.category') }}</th> <th style="width: 50%;">{{ trans('general.category') }}</th>
<th style="width: 10%;">{{ trans('general.checked_out') }}</th> <th style="width: 10%;">{{ trans('admin/hardware/table.checkout_date') }}</th>
</tr> </tr>
</thead> </thead>
@php @php
@ -246,10 +246,10 @@
<br> <br>
<table> <table>
<tr> <tr>
<td>{{ trans('admin/locations/table.signed_by') }}</td> <td>{{ trans('general.signed_off_by') }}:</td>
<td>________________________________________________________</td> <td>________________________________________________________</td>
<td></td> <td></td>
<td>{{ trans('general.date') }}</td> <td>{{ trans('general.date') }}:</td>
<td>________________________________________________________</td> <td>________________________________________________________</td>
</tr> </tr>
</table> </table>

33
webpack.mix.js
View file

@ -182,24 +182,21 @@ mix.combine(
*/ */
mix mix
.combine( .combine(
[ [
"./node_modules/bootstrap-table/dist/bootstrap-table.js", './node_modules/bootstrap-table/dist/bootstrap-table.js',
"./node_modules/bootstrap-table/dist/bootstrap-table-locale-all.js", './node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js',
"./node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js", './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
"./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js", './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
"./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js", './resources/assets/js/extensions/jquery.base64.js',
"./resources/assets/js/extensions/jquery.base64.js", './node_modules/tableexport.jquery.plugin/tableExport.min.js',
"./node_modules/tableexport.jquery.plugin/tableExport.min.js", './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js',
"./node_modules/tableexport.jquery.plugin/libs/jsPDF/polyfills.umd.min.js", './resources/assets/js/FileSaver.min.js',
"./node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js", './node_modules/xlsx/dist/xlsx.core.min.js',
"./resources/assets/js/FileSaver.min.js", './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
"./node_modules/xlsx/dist/xlsx.core.min.js", './node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js'
"./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js", ],
"./node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js", 'public/js/dist/bootstrap-table.js'
], ).version();
"public/js/dist/bootstrap-table.js"
)
.version();
mix mix
.combine( .combine(