lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

# Conflicts:

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
This commit is contained in:
snipe 2022-09-15 20:11:07 -07:00
commit 421c9baecc
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.10',
'full_app_version' => 'v6.0.10 - build 8610-g22710afee',
'build_version' => '8610',
'full_app_version' => 'v6.0.10 - build 8673-gc6cbf3712',
'build_version' => '8673',
'prerelease_version' => '',
'hash_version' => 'g22710afee',
'full_hash' => 'v6.0.10-91-g22710afee',
'hash_version' => 'gc6cbf3712',
'full_hash' => 'v6.0.10-60-gc6cbf3712',
'branch' => 'master',
);

6
package-lock.json generated
View file

@ -3184,9 +3184,9 @@
"integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
},
"bootstrap-table": {
"version": "1.21.0",
"resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.21.0.tgz",
"integrity": "sha512-lQlqfxg7PujDpfVPn2FFjvYI2xARZ1lnTjwLDvi9kzCvznNR+lw3OJvBcTOiGT/TsckGSpZCnGZVZH8mRNT1xw=="
"version": "1.20.2",
"resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.20.2.tgz",
"integrity": "sha512-6j9zfjjK6VZyJj8KsH+LnGczqglmMvMctGAoEAKDvrQ92ExQbA3mHGYPQr9iPrzoyeGL8+6Dyx6LqJbWmWmBoA=="
},
"brace-expansion": {
"version": "1.1.11",

2
package.json
View file

@ -34,7 +34,7 @@
"bootstrap-colorpicker": "^2.5.3",
"bootstrap-datepicker": "^1.9.0",
"bootstrap-less": "^3.3.8",
"bootstrap-table": "1.21.0",
"bootstrap-table": "1.20.2",
"chart.js": "^2.9.4",
"css-loader": "^3.6.0",
"ekko-lightbox": "^5.1.1",

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View file

@ -18,7 +18,7 @@
"/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=e29a5ec4f4256924ec79188134d2daa7",
"/css/dist/all.css": "/css/dist/all.css?id=4cb990f5b29620d9a304a32a08270457",
"/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",
@ -31,9 +31,9 @@
"/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=4dc0559754cfbb32af44fd8d1f31f599",
"/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=8a8812a2a710e171b8253185b1d48689",
"/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=8a7e40131d14a91b5f91cc65912079d7",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=acacaa29bb8ee6edc9d24611d7edf609",
"/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=24a1c3682f130658bd3e9f0431a0a376",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
"/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",