Adrian Hopek
|
811c644002
|
Merge branch 'main' into #6-google-calendar
# Conflicts:
# app/Domain/CalendarGenerator.php
# app/Domain/Enums/VacationRequestState.php
# app/Domain/VacationRequestStateManager.php
# app/Eloquent/Models/Vacation.php
# database/migrations/2022_02_07_133018_create_vacations_table.php
# resources/js/Composables/statusInfo.js
# resources/js/Pages/Calendar.vue
# tests/Feature/VacationRequestTest.php
# tests/Unit/VacationRequestStatesTest.php
|
2022-02-15 15:24:03 +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 |
|
Adrian Hopek
|
accc8255d0
|
#6 - wip
|
2022-02-15 14:44:10 +01:00 |
|
EwelinaLasowy
|
131924da76
|
#22 - fix
|
2022-02-14 15:30:09 +01:00 |
|
EwelinaLasowy
|
885dcdf9bb
|
#22 - fix
|
2022-02-14 15:29:24 +01:00 |
|
EwelinaLasowy
|
2bf2b99e28
|
#22 - fix
|
2022-02-14 15:26:50 +01:00 |
|
EwelinaLasowy
|
d026d41715
|
#22 - fix
|
2022-02-10 11:18:29 +01:00 |
|
EwelinaLasowy
|
1586d121f9
|
#22 - wip
|
2022-02-09 11:27:48 +01:00 |
|
EwelinaLasowy
|
aae3c7fcb2
|
#22 - wip
|
2022-02-09 11:25:23 +01:00 |
|
EwelinaLasowy
|
accce6af2b
|
#22 - added some tests
|
2022-02-09 09:39:13 +01:00 |
|