Adrian Hopek
|
aa0d83c147
|
#20 - fix
|
2022-02-03 08:35:39 +01:00 |
|
Adrian Hopek
|
e8118213e1
|
#20 - fix
|
2022-02-03 07:51:48 +01:00 |
|
Adrian Hopek
|
9a7ee2f5d3
|
#20 - wip
|
2022-02-02 10:37:16 +01:00 |
|
Adrian Hopek
|
3ebc391b83
|
Merge branch 'main' into #20-vacation-requests
# Conflicts:
# app/Architecture/Providers/ObserverServiceProvider.php
# app/Domain/Role.php
# app/Domain/Rules/ApprovedVacationDaysInSameRange.php
# app/Domain/Rules/DoesNotExceedLimitRule.php
# app/Domain/Rules/MinimumOneVacationDayRule.php
# app/Domain/Rules/PendingVacationRequestInSameRange.php
# app/Domain/Rules/UsedVacationDaysInSameRange.php
# app/Domain/Rules/VacationRequestRule.php
# app/Domain/VacationRequestState.php
# app/Domain/VacationRequestStateManager.php
# app/Domain/VacationRequestValidator.php
# app/Domain/VacationType.php
# app/Domain/VacationTypeConfigRetriever.php
# app/Eloquent/Models/User.php
# app/Infrastructure/Http/Controllers/UserController.php
# app/Infrastructure/Http/Kernel.php
# app/Infrastructure/Http/Requests/UserRequest.php
# database/factories/UserFactory.php
# database/seeders/DatabaseSeeder.php
# routes/web.php
# tests/Feature/UserTest.php
|
2022-02-01 11:35:44 +01:00 |
|
Adrian Hopek
|
fc84efd95f
|
#20 - fix
|
2022-02-01 09:33:30 +01:00 |
|
Adrian Hopek
|
58ef6af1a2
|
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
|
2022-02-01 09:24:55 +01:00 |
|
Adrian Hopek
|
01de63e9f4
|
#20 - wip
|
2022-02-01 09:20:40 +01:00 |
|
Adrian Hopek
|
f3559930c2
|
#20 - wip
|
2022-01-27 09:14:08 +01:00 |
|