Merge branch 'main' into #134-fill-users-data-for-resume

# Conflicts:
#	.eslintrc.js
#	composer.lock
#	package-lock.json
#	package.json
This commit is contained in:
Adrian Hopek
2022-05-11 09:03:20 +02:00
99 changed files with 3268 additions and 1529 deletions

View File

@@ -10,7 +10,7 @@
"ext-redis": "*",
"azuyalabs/yasumi": "^2.4",
"barryvdh/laravel-dompdf": "^1.0",
"fruitcake/laravel-cors": "^2.0",
"fruitcake/laravel-cors": "^3.0",
"guzzlehttp/guzzle": "^7.0.1",
"inertiajs/inertia-laravel": "^0.5.1",
"laravel/framework": "^9.7",
@@ -22,10 +22,11 @@
"phpoffice/phpword": "^0.18.3",
"rackbeat/laravel-ui-avatars": "^1.0",
"spatie/laravel-google-calendar": "^3.5",
"spatie/laravel-model-states": "^2.1"
"spatie/laravel-model-states": "^2.1",
"spatie/laravel-slack-slash-command": "^1.11"
},
"require-dev": {
"blumilksoftware/codestyle": "^1.0.0",
"blumilksoftware/codestyle": "^1.2.0",
"fakerphp/faker": "^1.19",
"laravel/dusk": "^6.21",
"mockery/mockery": "^1.4.4",
@@ -62,7 +63,8 @@
"extra": {
"laravel": {
"dont-discover": [
"laravel/telescope"
"laravel/telescope",
"spatie/laravel-slack-slash-command"
]
}
},