Revert "Revert "Merge branch 'master' into develop""

This reverts commit fc6d7d2b18.
This commit is contained in:
2021-10-13 01:47:16 +01:00
parent 64d8ffa9d9
commit 427c9d1c57
13 changed files with 2263 additions and 1916 deletions

View File

@@ -8,28 +8,23 @@
],
"license": "MIT",
"require": {
"php": "^7.3.4",
"php": "^8.0",
"ext-imagick": "*",
"ext-json": "*",
"arcanedev/log-viewer": "^8.0",
"awssat/discord-notification-channel": "^1.4",
"berkayk/onesignal-laravel": "^1.0",
"arcanedev/log-viewer": "^8.1.0",
"doctrine/dbal": "^2.10",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"geo-sot/laravel-env-editor": "^0.9.9",
"graham-campbell/markdown": "^13.1",
"guzzlehttp/guzzle": "^7.0.1",
"jeroennoten/laravel-adminlte": "^3.2",
"laravel/framework": "^8.0",
"laravel/sanctum": "^2.8",
"laravel/slack-notification-channel": "^2.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"mcamara/laravel-localization": "^1.5",
"mpociot/teamwork": "^6.0",
"pragmarx/google2fa-laravel": "^1.3",
"sentry/sentry-laravel": "2.1.1",
"sentry/sentry-laravel": "2.9.0",
"spatie/laravel-permission": "^3.13"
},
"require-dev": {
@@ -38,7 +33,7 @@
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^9.3"
},
"config": {
"optimize-autoloader": true,
@@ -54,6 +49,7 @@
"psr-4": {
"App\\": "app/"
}
},
"autoload-dev": {
"psr-4": {