#62 - vacation request list for approvers #69

Merged
Baakoma merged 29 commits from #62-vacation-request-list-for-approvers into main 2022-03-08 09:25:24 +01:00

29 Commits

Author SHA1 Message Date
Adrian Hopek
57db46ccd5 #62 - ecs fix 2022-03-07 15:26:28 +01:00
Adrian Hopek
b11e60ab74 #62 - fix 2022-03-07 15:16:53 +01:00
Adrian Hopek
f0355f56d3 #62 - fix 2022-03-07 15:13:37 +01:00
Adrian Hopek
069109c4b0 #62 - fix 2022-03-07 14:43:40 +01:00
Adrian Hopek
78d209dc3e #62 - fix 2022-03-07 14:08:40 +01:00
Adrian Hopek
937d9572a7 #62 - fix 2022-03-07 13:33:31 +01:00
Adrian Hopek
b2f08f61b7 #62 - wip 2022-03-07 13:05:49 +01:00
Adrian Hopek
5d64ad9d2a #62 - wip 2022-03-07 11:31:53 +01:00
Adrian Hopek
3a1b9862c1 Merge branch 'main' into #62-vacation-request-list-for-approvers
# Conflicts:
#	app/Eloquent/Helpers/UserAvatarGenerator.php
#	composer.lock
#	database/factories/VacationRequestActivityFactory.php
#	database/seeders/DatabaseSeeder.php
#	database/seeders/DemoSeeder.php
2022-03-07 10:53:35 +01:00
Adrian Hopek
fdafb76461 #62 - wip 2022-03-03 10:52:05 +01:00
Adrian Hopek
c21d2c8663 #43 - fix 2022-03-02 10:54:47 +01:00
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
758689d376 #43 - cr fix 2022-03-02 09:52:25 +01:00
Adrian Hopek
afe5834af6 #43 - cr fix 2022-03-02 09:29:23 +01:00
Adrian Hopek
ac81882b3f #43 - ecs fix 2022-03-01 12:47:51 +01:00
Adrian Hopek
bdbb183b7d #43 - wip 2022-03-01 12:46:45 +01:00
Adrian Hopek
2073256067 #43 - fix 2022-03-01 12:42:44 +01:00
Adrian Hopek
730b0f9adb #43 - fix 2022-03-01 12:41:07 +01:00
Adrian Hopek
37c08f3823 #43 - add composer script 2022-03-01 12:36:06 +01:00
Adrian Hopek
a37be18da6 #43 - wip 2022-03-01 12:36:00 +01:00
Adrian Hopek
92784846dc #5 - bump dependencies 2022-03-01 09:31:45 +01:00
Adrian Hopek
936a279606 Merge branch 'vacation-request-form' into dashboard 2022-02-28 15:26:46 +01:00
Adrian Hopek
2c15cde6c8 wip 2022-02-28 14:22:04 +01:00
Adrian Hopek
0c5e3b5926 wip 2022-02-28 07:51:35 +01:00
EwelinaLasowy
22fc753c73 wip 2022-02-28 07:46:18 +01:00
Adrian Hopek
c050c4c42d wip 2022-02-28 07:33:47 +01:00
EwelinaLasowy
e442da9303 wip 2022-02-25 16:20:08 +01:00
EwelinaLasowy
7381556f31 wip 2022-02-25 14:23:50 +01:00
Adrian Hopek
5ded4008c7 wip 2022-02-25 10:29:45 +01:00