Merge branch 'develop' of github.com:snipe/snipe-it into develop

resources/views/accessories/index.blade.php

@@ -75,6 +75,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'accessories-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/asset_maintenances/index.blade.php

@@ -80,6 +80,9 @@
       showColumns: true,
       exportDataType: 'all',
       exportTypes: ['csv', 'txt','json', 'xml'],
+      exportOptions: {
+          fileName: 'maintenances-export-' + (new Date()).toISOString().slice(0,10),
+      },
       maintainSelected: true,
       paginationFirstText: "{{ trans('general.first') }}",
       paginationLastText: "{{ trans('general.last') }}",

resources/views/categories/index.blade.php

@@ -77,6 +77,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'categories-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/components/index.blade.php

@@ -96,6 +96,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'components-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/consumables/index.blade.php

@@ -80,6 +80,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'consumables-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/depreciations/index.blade.php

@@ -75,6 +75,9 @@ $('#table').bootstrapTable({
     showColumns: true,
     exportDataType: 'all',
     exportTypes: ['csv', 'txt','json', 'xml'],
+    exportOptions: {
+        fileName: 'depreciations-export-' + (new Date()).toISOString().slice(0,10),
+    },
     maintainSelected: true,
     paginationFirstText: "{{ trans('general.first') }}",
     paginationLastText: "{{ trans('general.last') }}",

resources/views/groups/index.blade.php

@@ -70,6 +70,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'groups-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/hardware/index.blade.php

@@ -161,6 +161,9 @@
         paginationPreText: "{{ trans('general.previous') }}",
         paginationNextText: "{{ trans('general.next') }}",
         pageList: ['10','25','50','100','150','200','500','1000'],
+        exportOptions: {
+            fileName: 'assets-export-' + (new Date()).toISOString().slice(0,10),
+        },
         icons: {
             paginationSwitchDown: 'fa-caret-square-o-down',
             paginationSwitchUp: 'fa-caret-square-o-up',

resources/views/licenses/index.blade.php

@@ -85,6 +85,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'licenses-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/locations/index.blade.php

@@ -20,7 +20,7 @@
         <div class="table-responsive">
 
           <table
-          name="categories"
+          name="locations"
           class="table table-striped"
           id="table"
           data-url="{{ route('api.locations.list') }}"
@@ -77,6 +77,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'locations-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/manufacturers/index.blade.php

@@ -74,6 +74,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'manufacturers-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/models/index.blade.php

@@ -76,11 +76,16 @@
         pagination: true,
         sidePagination: 'server',
         sortable: true,
-        mobileResponsive: true,
-        showExport: true,
         cookie: true,
         cookieExpire: '2y',
+        mobileResponsive: true,
+        showExport: true,
         showColumns: true,
+        exportDataType: 'all',
+        exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'models-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/statuslabels/index.blade.php

@@ -72,6 +72,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'statuslabels-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/suppliers/index.blade.php

@@ -75,6 +75,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'suppliers-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/users/index.blade.php

@@ -53,7 +53,7 @@
 
 
              <table
-              name="assets"
+              name="users"
               data-toolbar="#toolbar"
               class="table table-striped"
               id="table"
@@ -149,6 +149,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'users-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

snipeit.sh

@@ -259,7 +259,7 @@ case $distro in
 		sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log 2>&1 
 
 		if [ "$version" == "16.04" ]; then
-			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-mbstring >> /var/log/snipeit-install.log 2>&1
+			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
 			#Enable mcrypt and rewrite
 			echo "##  Enabling mcrypt and rewrite"
 			sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1