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

snipe · Jul 14, 2020 · 6e563f6 · 6e563f6
2 parents 5320f5c + 7f69ae9
commit 6e563f6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v6.11.3
diff --git a/public/js/build/all.js b/public/js/build/all.js
diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -18,7 +18,7 @@
     "/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.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/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
     "/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.css.map": "/css/skins/skin-orange.css.map?id=f90fda3cc0a48c048a9e",
     "/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",
-    "/js/build/all.js": "/js/build/all.js?id=bf5cd2065e997d7692e0"
+    "/js/build/all.js": "/js/build/all.js?id=4513ccdd4533b52922a8"
 }
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js
@@ -224,7 +224,7 @@ $(document).ready(function () {
                     var answer =  {
                         results: data.items,
                         pagination: {
-                            more: "true" //(params.page  < data.page_count)
+                            more: data.pagination.more
                         }
                     };
 

diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js
@@ -74,7 +74,7 @@ $(function () {
                         var answer =  {
                             results: data.items,
                             pagination: {
-                                more: "true" //(params.page  < data.page_count)
+                                more: data.pagination.more
                             }
                         };
 

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