Adrian Hopek 61f7bbeca7 Merge branch 'main' into states ...

# Conflicts:
#	app/Domain/CalendarGenerator.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/VacationRequest.php
#	app/Eloquent/Observers/VacationRequestObserver.php
#	composer.json
#	composer.lock
#	tests/Feature/VacationRequestTest.php

2022-02-24 09:51:23 +01:00

..

Holidays

#38 - vacation request by administrative approver (#57)

2022-02-22 11:02:36 +01:00

Users

#22 - vacation calendar (#51)

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

VacationRequest

Merge branch 'main' into states

2022-02-24 09:51:23 +01:00

Calendar.vue

#39 - generate timesheet (#56)

2022-02-21 16:09:45 +01:00

Dashboard.vue

#22 - vacation calendar (#51)

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

Login.vue

#42 - global notifications (#50)

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

VacationLimits.vue

#22 - vacation calendar (#51)

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