Adrian Hopek
|
61f7bbeca7
|
Merge branch 'main' into states
# Conflicts:
# app/Domain/CalendarGenerator.php
# app/Domain/VacationRequestStateManager.php
# app/Eloquent/Models/VacationRequest.php
# app/Eloquent/Observers/VacationRequestObserver.php
# composer.json
# composer.lock
# tests/Feature/VacationRequestTest.php
|
2022-02-24 09:51:23 +01:00 |
|
Adrian Hopek
|
17cdee38e0
|
#38 - vacation request by administrative approver (#57)
* #38 - wip
* #38 - wip
* #38 - fix
* #38 - fix
* #38 - fix
* #38 - fix
* Update resources/lang/pl.json
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
* #38 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
|
2022-02-22 11:02:36 +01:00 |
|
Adrian Hopek
|
2ccdfed2ec
|
wip
|
2022-02-21 08:11:28 +01:00 |
|
Adrian Hopek
|
6c352b629c
|
#22 - vacation calendar (#51)
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - cr fixes
* #22 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-15 15:08:26 +01:00 |
|