Adrian Hopek
|
474707e691
|
Merge branch 'main' into #43-vacation-summary-for-employee
# Conflicts:
# app/Infrastructure/Http/Controllers/HolidayController.php
# app/Infrastructure/Http/Controllers/VacationLimitController.php
# app/Infrastructure/Http/Controllers/VacationRequestController.php
# composer.lock
# resources/js/Pages/Holidays/Index.vue
# resources/js/Pages/VacationRequest/Create.vue
|
2022-03-02 10:44:07 +01:00 |
|
Adrian Hopek
|
d825dd727f
|
#63 - permissions (#67)
* wip
* fix
* wip
* #63 - permissions
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-03-02 09:52:50 +01:00 |
|
EwelinaLasowy
|
22fc753c73
|
wip
|
2022-02-28 07:46:18 +01:00 |
|
Adrian Hopek
|
39b464388c
|
#39 - generate timesheet (#56)
* #39 - wip
* #39 - fix
* #39 - wip
* #39 - wip
* #39 - wip
* Update app/Domain/Enums/Month.php
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
* #39 - cr fixes
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
|
2022-02-21 16:09:45 +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 |
|