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

This commit is contained in:
snipe
2016-07-01 01:06:41 -07:00
4 changed files with 466 additions and 236 deletions
+1
View File
@@ -27,6 +27,7 @@
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "2.*",
"phpspec/phpspec": "~2.1",
"codeception/codeception": "2.1.*",
"symfony/dom-crawler": "~3.0",
Generated
+460 -231
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -142,9 +142,9 @@ return [
'whenBackupWasSuccessful' => ['log'],
'whenCleanupWasSuccessful' => ['log'],
'whenHealthyBackupWasFound' => ['log'],
'whenBackupHasFailed' => ['log', 'mail'],
'whenCleanupHasFailed' => ['log', 'mail'],
'whenUnhealthyBackupWasFound' => ['log', 'mail'],
'whenBackupHasFailed' => ['log'],
'whenCleanupHasFailed' => ['log'],
'whenUnhealthyBackupWasFound' => ['log'],
],
/*
+2 -2
View File
@@ -146,8 +146,8 @@
sidePagination: 'server',
sortable: true,
showMultiSort: true,
//cookie: true,
//cookieExpire: '2y',
cookie: true,
cookieExpire: '2y',
mobileResponsive: true,
showExport: true,
showColumns: true,