Merge remote-tracking branch 'origin/v3' into v3-master
This commit is contained in:
@@ -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
File diff suppressed because it is too large
Load Diff
@@ -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'],
|
||||
],
|
||||
|
||||
/*
|
||||
|
||||
@@ -146,8 +146,8 @@
|
||||
sidePagination: 'server',
|
||||
sortable: true,
|
||||
showMultiSort: true,
|
||||
//cookie: true,
|
||||
//cookieExpire: '2y',
|
||||
cookie: true,
|
||||
cookieExpire: '2y',
|
||||
mobileResponsive: true,
|
||||
showExport: true,
|
||||
showColumns: true,
|
||||
|
||||
Reference in New Issue
Block a user