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

..

Holidays

#63 - permissions (#67)

2022-03-02 09:52:50 +01:00

Users

#22 - vacation calendar (#51)

2022-02-15 15:08:26 +01:00

VacationRequest

Merge branch 'main' into #43-vacation-summary-for-employee

2022-03-02 10:44:07 +01:00

Calendar.vue

Merge branch 'main' into #43-vacation-summary-for-employee

2022-03-02 10:44:07 +01:00

Dashboard.vue

wip

2022-02-28 07:46:18 +01:00

Login.vue

#42 - global notifications (#50)

2022-02-16 08:43:12 +01:00

VacationLimits.vue

#43 - wip

2022-03-01 12:36:00 +01:00