DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/snipe/snipe-it

Browse source
This commit is contained in:
snipe 2020-07-13 21:16:54 -07:00
parent 5320f5c67c 7f69ae953b
commit 6e563f6e4b
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
8 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.nvmrc Normal file
View file

@ -0,0 +1 @@
v6.11.3

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

Binary file not shown.

BIN
public/js/build/vue.js.map
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

@ -18,7 +18,7 @@
"/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
"/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
"/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=59664dbd286988d2a438",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=b1638dbc458713cd9c38", "/js/build/vue.js.map": "/js/build/vue.js.map?id=1760ae00d44238e44172",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b", "/css/overrides.css.map": "/css/overrides.css.map?id=f3e3cf42859eb4a28a7b",
@ -38,7 +38,7 @@
"/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29",
"/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e",
"/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d", "/css/dist/all.css": "/css/dist/all.css?id=0491555899142b86167d",
"/js/dist/all.js": "/js/dist/all.js?id=bf5cd2065e997d7692e0", "/js/dist/all.js": "/js/dist/all.js?id=4513ccdd4533b52922a8",
"/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d", "/css/build/all.css": "/css/build/all.css?id=0491555899142b86167d",
"/js/build/all.js": "/js/build/all.js?id=bf5cd2065e997d7692e0" "/js/build/all.js": "/js/build/all.js?id=4513ccdd4533b52922a8"
} }

2
resources/assets/js/snipeit.js
View file

@ -224,7 +224,7 @@ $(document).ready(function () {
var answer = { var answer = {
results: data.items, results: data.items,
pagination: { pagination: {
more: "true" //(params.page < data.page_count) more: data.pagination.more
} }
}; };

2
resources/assets/js/snipeit_modals.js
View file

@ -74,7 +74,7 @@ $(function () {
var answer = { var answer = {
results: data.items, results: data.items,
pagination: { pagination: {
more: "true" //(params.page < data.page_count) more: data.pagination.more
} }
}; };

2
snipeit.sh
View file

@ -422,7 +422,7 @@ case $distro in
fi fi
;; ;;
ubuntu) ubuntu)
if [ "$version" == "18.04" ]; then if [ "$version" -ge "18.04" ]; then
# Install for Ubuntu 18.04 # Install for Ubuntu 18.04
tzone=$(cat /etc/timezone) tzone=$(cat /etc/timezone)