DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2016-07-27 20:16:54 -07:00
parent 1493251794 b4e54225a2
commit 3514ae2c0d
17 changed files with 1356 additions and 344 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1643
public/assets/js/extensions/export/tableExport.js
View file

File diff suppressed because it is too large Load diff

3
resources/views/accessories/index.blade.php
View file

@ -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') }}",

3
resources/views/asset_maintenances/index.blade.php
View file

@ -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') }}",

3
resources/views/categories/index.blade.php
View file

@ -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') }}",

3
resources/views/components/index.blade.php
View file

@ -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') }}",

3
resources/views/consumables/index.blade.php
View file

@ -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') }}",

3
resources/views/depreciations/index.blade.php
View file

@ -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') }}",

3
resources/views/groups/index.blade.php
View file

@ -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') }}",

3
resources/views/hardware/index.blade.php
View file

@ -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',

3
resources/views/licenses/index.blade.php
View file

@ -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') }}",

5
resources/views/locations/index.blade.php
View file

@ -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') }}",

3
resources/views/manufacturers/index.blade.php
View file

@ -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') }}",

9
resources/views/models/index.blade.php
View file

@ -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') }}",

3
resources/views/statuslabels/index.blade.php
View file

@ -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') }}",

3
resources/views/suppliers/index.blade.php
View file

@ -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') }}",

5
resources/views/users/index.blade.php
View file

@ -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') }}",

2
snipeit.sh
View file

@ -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