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
|
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 |
|
Krzysztof Rewak
|
f6d59f8bfb
|
- directory refactor (#32)
* - directory refactor
* - readme.md update
* Update readme.md
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* Update readme.md
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-01-26 12:31:26 +01:00 |
|
Adrian Hopek
|
026bfe485f
|
#28 - holidays management (#30)
* #28 - holidays management
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - cr fix
|
2022-01-25 09:02:48 +01:00 |
|
Adrian Hopek
|
6854c7a9f8
|
#27 - separate fields for name and surname (#29)
* #27 - separate fields for name and surname
* #27 -cr fix
|
2022-01-24 12:40:56 +01:00 |
|
Adrian Hopek
|
e147d24365
|
#23 - collective editing vacation days (#26)
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - fix
* #23 - ecs fix
* #23 - fix
* #23 - fix
* #23 - cr fix
|
2022-01-24 11:28:00 +01:00 |
|
Adrian Hopek
|
9aa2d5ec0f
|
#4 - users CRUD (#24)
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #4- wip
* #4 - wip
* #4 - wip
* #4 - wip
* #4- wip
* #4 - wip
* #4 - wip
* #4 - tests
* #4 - ecs fix
* #4 - fix
* #4 - wip
* #4 - fix
* #4 - fix
* #4 - fix composer
* #4 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-01-19 10:55:10 +01:00 |
|