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 |
|
Adrian Hopek
|
92784846dc
|
#5 - bump dependencies
|
2022-03-01 09:31:45 +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 |
|