Merge remote-tracking branch 'origin/#20-vacation-requests' into #20-vacation-requests
# Conflicts: # app/Enums/VacationType.php # app/Helpers/Rules/MinimumOneVacationDayRule.php # app/Helpers/Rules/PendingVacationRequestInSameRange.php # app/Helpers/VacationRequestValidator.php # app/Http/Controllers/VacationRequestController.php # app/Http/Resources/VacationRequestResource.php # app/Models/VacationRequest.php # config/sanctum.php # database/factories/VacationRequestFactory.php # database/migrations/2022_01_26_100039_create_vacation_requests_table.php # package-lock.json # resources/js/Pages/VacationRequest/Create.vue # resources/js/Pages/VacationRequest/Index.vue # resources/js/Shared/MainMenu.vue # resources/lang/pl.json # routes/web.php
This commit is contained in:
64
composer.lock
generated
64
composer.lock
generated
@@ -1422,6 +1422,70 @@
|
||||
},
|
||||
"time": "2022-01-12T15:07:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/sanctum",
|
||||
"version": "v2.14.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/sanctum.git",
|
||||
"reference": "0647a87140c7522e75826cffcadb3ad6e01f71e9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/sanctum/zipball/0647a87140c7522e75826cffcadb3ad6e01f71e9",
|
||||
"reference": "0647a87140c7522e75826cffcadb3ad6e01f71e9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"illuminate/contracts": "^6.9|^7.0|^8.0|^9.0",
|
||||
"illuminate/database": "^6.9|^7.0|^8.0|^9.0",
|
||||
"illuminate/support": "^6.9|^7.0|^8.0|^9.0",
|
||||
"php": "^7.2|^8.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"mockery/mockery": "^1.0",
|
||||
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
|
||||
"phpunit/phpunit": "^8.0|^9.3"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "2.x-dev"
|
||||
},
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Laravel\\Sanctum\\SanctumServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Laravel\\Sanctum\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Taylor Otwell",
|
||||
"email": "taylor@laravel.com"
|
||||
}
|
||||
],
|
||||
"description": "Laravel Sanctum provides a featherweight authentication system for SPAs and simple APIs.",
|
||||
"keywords": [
|
||||
"auth",
|
||||
"laravel",
|
||||
"sanctum"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel/sanctum/issues",
|
||||
"source": "https://github.com/laravel/sanctum"
|
||||
},
|
||||
"time": "2022-01-12T15:07:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/serializable-closure",
|
||||
"version": "v1.0.5",
|
||||
|
||||
Reference in New Issue
Block a user