EwelinaLasowy
|
c301ab7c26
|
Merge branch 'main' into #42-global-notifications
# Conflicts:
# app/Domain/Enums/VacationRequestState.php
# app/Domain/VacationRequestStateManager.php
# app/Eloquent/Models/Vacation.php
# app/Infrastructure/Http/Controllers/VacationCalendarController.php
# app/Infrastructure/Http/Controllers/VacationRequestController.php
# database/factories/VacationFactory.php
# database/migrations/2022_02_07_133018_create_vacations_table.php
# database/seeders/DatabaseSeeder.php
# resources/js/Pages/Calendar.vue
# resources/js/Shared/Activity.vue
# resources/js/Shared/MainMenu.vue
# resources/js/Shared/Status.vue
# tailwind.config.js
# tests/Feature/VacationRequestTest.php
# tests/Unit/VacationRequestStatesTest.php
|
2022-02-15 15:17:01 +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
|
425d7c7608
|
#42 - wip
|
2022-02-15 10:30:41 +01:00 |
|
Adrian Hopek
|
09b95602da
|
#22 - wip
|
2022-02-08 15:04:32 +01:00 |
|
Adrian Hopek
|
75506dfb6d
|
Merge branch 'vacation-request-ui-polishing' into #22-vacation-calendar
|
2022-02-08 09:06:15 +01:00 |
|
Adrian Hopek
|
cc90851bca
|
#22 - wip
|
2022-02-07 14:37:14 +01:00 |
|
Adrian Hopek
|
6deb5b65e2
|
Merge remote-tracking branch 'origin/vacation-request-ui-polishing' into #22-vacation-calendar
|
2022-02-07 12:35:02 +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 |
|
EwelinaLasowy
|
39665c9c31
|
wip
|
2022-02-07 10:38:42 +01:00 |
|
EwelinaLasowy
|
205fdd7671
|
wip
|
2022-02-04 15:27:11 +01:00 |
|
Adrian Hopek
|
41c769d4ab
|
#40 - generate pdf for vacation request (#46)
* #40 - wip
* #40 - generate pdf
* #40 - fix
* Update resources/js/Pages/VacationRequest/Show.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* #40 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
|
2022-02-04 10:57:11 +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 |
|