DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2022-08-10 16:11:29 -07:00
parent c77d763f05 d4e60a46c1
commit c7d9baad8e
43 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/version.php
View file

@ -6,5 +6,5 @@ return array (
'prerelease_version' => '',
'hash_version' => 'g51f729872',
'full_hash' => 'v6.0.9-103-g51f729872',
'branch' => 'develop',
'branch' => 'master',
);

BIN
public/css/build/AdminLTE.css
View file

Binary file not shown.

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

Binary file not shown.

BIN
public/css/build/overrides.css
View file

Binary file not shown.

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/css/dist/signature-pad.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-black-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-black-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-black.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-black.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-blue.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-contrast.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-contrast.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-green.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-orange.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-purple.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-red.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow-dark.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow-dark.min.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow.css vendored
View file

Binary file not shown.

BIN
public/css/dist/skins/skin-yellow.min.css vendored
View file

Binary file not shown.

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.

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

Binary file not shown.

72
public/mix-manifest.json
View file

@ -1,24 +1,24 @@
{
"/js/build/app.js": "/js/build/app.js?id=20dff7dc4c2bff26e20b4e78ad9dd9e5",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349",
"/css/build/overrides.css": "/css/build/overrides.css?id=933065998b88257a57bfb1650d82b76c",
"/css/build/app.css": "/css/build/app.css?id=4cbaeaaac109b0a70a3ad718b66f5b82",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=710f4c82f6f13fc9edfa88a378623621",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b7ab5ed379611d0bb96ab06bd93bb204",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=c1c4144c4d6448fa40905d31abe25b6f",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=256b5dde6c4a4eed91171b59d3cf07e0",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=73bb57f917efb32895488cef3d92b42a",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=0c67d6bedcd67993ea2c8af8a2a223fa",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=e26410d91aa3ef39c97e816187cf670c",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=b165571f42e59a72e6165af9b1b7d429",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7",
"/css/dist/all.css": "/css/dist/all.css?id=7aa07fa7dad1ea53568782ab1a822179",
"/js/build/app.js": "/js/build/app.js?id=9b2bd6c2e9b882c53969c66a9628a150",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
"/css/build/overrides.css": "/css/build/overrides.css?id=6a8926c5699dc8117fce282bddef6222",
"/css/build/app.css": "/css/build/app.css?id=e319e07a1e4eeb413e5667136850ea12",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0245911190e2ff51f1710360b9fd25c4",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=b56c0c0c824d6c61b2ec83bc23633184",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=6f96d990312f7399988d14cb99d93165",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=bcacab67c45f81a06e6f84c4872cfd84",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3a6f6c5794864b09096b6abf9760142b",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=06ff5fe6930e974a9d13794196fcf48a",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=c2713ee362b046e0495fe162a981e860",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=832480a768184432af05d0109acfd7c8",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c3033f52259f665b0e46b9c88543035a",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c13434c44fb6016396b1f7bac44e77d2",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
"/css/dist/all.css": "/css/dist/all.css?id=82b3119afe3686b7f39f0ae690959768",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
@ -34,20 +34,20 @@
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd",
"/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
"/js/dist/all.js": "/js/dist/all.js?id=ea971e5285bb940af1a908bbeeb6fcb8",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=407f83d58689706f303a83e195f6c041",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=b165571f42e59a72e6165af9b1b7d429",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=e26410d91aa3ef39c97e816187cf670c",
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=b7ab5ed379611d0bb96ab06bd93bb204",
"/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c1c4144c4d6448fa40905d31abe25b6f",
"/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=0c67d6bedcd67993ea2c8af8a2a223fa",
"/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=73bb57f917efb32895488cef3d92b42a",
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=256b5dde6c4a4eed91171b59d3cf07e0",
"/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f",
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=710f4c82f6f13fc9edfa88a378623621",
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b"
"/js/dist/all.js": "/js/dist/all.js?id=065a8f4827b94b2f743fa1598ff2f196",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=af9b811e81b591789d1155c0d4ed42af",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c13434c44fb6016396b1f7bac44e77d2",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c3033f52259f665b0e46b9c88543035a",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=832480a768184432af05d0109acfd7c8",
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=940da5c039a1f104654e127e0d43b801",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=b56c0c0c824d6c61b2ec83bc23633184",
"/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=bcacab67c45f81a06e6f84c4872cfd84",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=6f96d990312f7399988d14cb99d93165",
"/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=476ccb37fe487f4d29ebfb49c198e311",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=c2713ee362b046e0495fe162a981e860",
"/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=06ff5fe6930e974a9d13794196fcf48a",
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3a6f6c5794864b09096b6abf9760142b",
"/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=083eab0a6e1062adfe24ee21a829e6c3",
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0245911190e2ff51f1710360b9fd25c4",
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf"
}