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 |
|
Adrian Hopek
|
067b343f24
|
#20 - vacation requests (#35)
* #20 - wip
* #20 - wip
* #20 - fix
* #20 - wip
* #20 - fix
* #20 - fix
|
2022-02-03 08:39:09 +01:00 |
|
EwelinaLasowy
|
b78ac0cb45
|
change layout
|
2022-02-01 08:55:36 +01:00 |
|
Adrian Hopek
|
026bfe485f
|
#28 - holidays management (#30)
* #28 - holidays management
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - fix
* #28 - cr fix
|
2022-01-25 09:02:48 +01:00 |
|