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
|
425d7c7608
|
#42 - wip
|
2022-02-15 10:30:41 +01:00 |
|
EwelinaLasowy
|
166bec1e51
|
#42 - fix
|
2022-02-14 10:39:50 +01:00 |
|
Adrian Hopek
|
726d955dc4
|
#42 - wip
|
2022-02-14 10:05:36 +01:00 |
|
EwelinaLasowy
|
d4c2f80eec
|
#42 - wip
|
2022-02-10 11:22:07 +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 |
|
Adrian Hopek
|
09b95602da
|
#22 - wip
|
2022-02-08 15:04:32 +01:00 |
|
Adrian Hopek
|
26a6d81dc2
|
#22 - fix
|
2022-02-08 14:05:40 +01:00 |
|
Adrian Hopek
|
61dab0c653
|
#22 - wip
|
2022-02-08 13:57:15 +01:00 |
|
Adrian Hopek
|
95bead085c
|
#22 - wip
|
2022-02-08 13:50:26 +01:00 |
|
Adrian Hopek
|
753d4bb296
|
#22 - wip
|
2022-02-08 13:46:52 +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
|
072fa6d432
|
Merge branch 'main' into #22-vacation-calendar
|
2022-02-07 12:31:27 +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
|
79d86b2491
|
#22 - wip
|
2022-02-04 08:43:12 +01:00 |
|
Adrian Hopek
|
47288917a2
|
Merge branch 'main' into #22-vacation-calendar
# Conflicts:
# resources/js/Pages/Dashboard.vue
# resources/js/Shared/Layout/AppLayout.vue
# resources/js/Shared/MainMenu.vue
# routes/web.php
|
2022-02-03 10:31:17 +01:00 |
|
EwelinaLasowy
|
b78ac0cb45
|
change layout
|
2022-02-01 08:55:36 +01:00 |
|
EwelinaLasowy
|
bbb0eb8f6c
|
change layout
|
2022-01-27 11:05:50 +01:00 |
|