DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-07-01 01:06:41 -07:00
parent d4628b5c0f 8fe1b88947
commit 85606d830d
4 changed files with 466 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -27,6 +27,7 @@
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "2.*",
"phpspec/phpspec": "~2.1", "phpspec/phpspec": "~2.1",
"codeception/codeception": "2.1.*", "codeception/codeception": "2.1.*",
"symfony/dom-crawler": "~3.0", "symfony/dom-crawler": "~3.0",

691
composer.lock generated
View file

File diff suppressed because it is too large Load diff

6
config/laravel-backup.php
View file

@ -142,9 +142,9 @@ return [
'whenBackupWasSuccessful' => ['log'], 'whenBackupWasSuccessful' => ['log'],
'whenCleanupWasSuccessful' => ['log'], 'whenCleanupWasSuccessful' => ['log'],
'whenHealthyBackupWasFound' => ['log'], 'whenHealthyBackupWasFound' => ['log'],
'whenBackupHasFailed' => ['log', 'mail'], 'whenBackupHasFailed' => ['log'],
'whenCleanupHasFailed' => ['log', 'mail'], 'whenCleanupHasFailed' => ['log'],
'whenUnhealthyBackupWasFound' => ['log', 'mail'], 'whenUnhealthyBackupWasFound' => ['log'],
], ],
/* /*

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

@ -146,8 +146,8 @@
sidePagination: 'server', sidePagination: 'server',
sortable: true, sortable: true,
showMultiSort: true, showMultiSort: true,
//cookie: true, cookie: true,
//cookieExpire: '2y', cookieExpire: '2y',
mobileResponsive: true, mobileResponsive: true,
showExport: true, showExport: true,
showColumns: true, showColumns: true,