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

..

Api

#43 - cr fix

2022-03-02 09:29:23 +01:00

Controller.php

- directory refactor (#32)

2022-01-26 12:31:26 +01:00

DashboardController.php

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

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

GoogleController.php

- directory refactor (#32)

2022-01-26 12:31:26 +01:00

HolidayController.php

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

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

LogoutController.php

- directory refactor (#32)

2022-01-26 12:31:26 +01:00

SelectYearPeriodController.php

#42 - global notifications (#50)

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

TimesheetController.php

#63 - permissions (#67)

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

UserController.php

#63 - permissions (#67)

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

VacationCalendarController.php

#63 - permissions (#67)

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

VacationLimitController.php

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

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

VacationRequestController.php

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

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