EwelinaLasowy
|
f7aa85ac31
|
#41 - wip
|
2022-02-17 12:25:43 +01:00 |
|
EwelinaLasowy
|
3c499e8be3
|
Merge branch 'main' into #41-email-notifications
# Conflicts:
# app/Domain/CalendarGenerator.php
# app/Domain/Enums/VacationRequestState.php
# app/Domain/VacationRequestStateManager.php
# resources/js/Composables/statusInfo.js
# resources/js/Pages/Calendar.vue
# resources/js/Shared/MainMenu.vue
# resources/lang/pl.json
# tests/Feature/VacationRequestTest.php
# tests/Unit/VacationRequestStatesTest.php
|
2022-02-16 08:53:55 +01:00 |
|
Ewelina Lasowy
|
f81c7ca8fa
|
#42 - global notifications (#50)
* 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
* #42 - wip
* #42 - wip
* #42 - fix
* #42 - wip
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
|
2022-02-16 08:43:12 +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 |
|
EwelinaLasowy
|
40226305fb
|
Merge branch '#22-vacation-calendar' into #41-email-notifications
|
2022-02-15 10:07:08 +01:00 |
|
EwelinaLasowy
|
885dcdf9bb
|
#22 - fix
|
2022-02-14 15:29:24 +01:00 |
|
EwelinaLasowy
|
a0b64e6cb3
|
#41 - wip
|
2022-02-11 13:02:35 +01:00 |
|
Adrian Hopek
|
b161981d5a
|
#36 - validate vacation request (#47)
* #36 - wip
* #36 - wip
* #36 - wip
* #36 - added some translations
* #36 - fix
* #36 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
|
2022-02-07 12:29:46 +01:00 |
|
Adrian Hopek
|
067b343f24
|
#20 - vacation requests (#35)
* #20 - wip
* #20 - wip
* #20 - fix
* #20 - wip
* #20 - fix
* #20 - fix
|
2022-02-03 08:39:09 +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 |
|
Adrian Hopek
|
0869395aab
|
#2 - authentication via google (#16)
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #2 - add title to login page
* Apply suggestions from code review
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
* #2 - cr fix
* #2 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
|
2022-01-13 14:19:11 +01:00 |
|