Adrian Hopek
dd1aa0d0f8
Merge branch 'main' into #134-fill-users-data-for-resume
...
# Conflicts:
# .eslintrc.js
# composer.lock
# package-lock.json
# package.json
2022-05-11 09:06:12 +02:00
Adrian Hopek
22c5f7bb54
wip
2022-05-10 12:19:58 +02:00
Adrian Hopek
5c55f1860a
wip
2022-05-10 10:14:48 +02:00
Krzysztof Rewak
88b1543071
- adding day of week to upcoming holidays ( #143 )
2022-05-10 09:41:30 +02:00
Adrian Hopek
37ce3262ac
wip
2022-05-09 15:03:09 +02:00
Ewelina Lasowy
f4d928c6ae
- UX fixes ( #142 )
...
* - changed homeoffice icon color
* - improved list of request on dashboard
* - hide holidays if no data
* - fix to holidays
* - fix
* - made forms looks better
* - hide chart when user has no vacation limit
* - linter fix
* - fix to pdf attachment for vacation request
2022-05-06 12:29:06 +02:00
Adrian Hopek
911c54f9ab
wip
2022-04-29 15:07:19 +02:00
Adrian Hopek
0ae521a5c2
wip
2022-04-28 11:46:18 +02:00
EwelinaLasowy
9778434772
wip
2022-04-28 07:56:11 +02:00
Adrian Hopek
d60dc75f99
#118 - keys ( #128 )
...
* #118 - wip
* #118 - keys
* #118 - fix
* #118 - fix menu
* #118 - fix to policies and added translations
* #118 - wip
* #118 - tests
* #118 - fix
* #118 - fix
* #118 - fix
* Update resources/lang/pl.json
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* #118 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-21 08:16:31 +02:00
Adrian Hopek
c95d08c861
#120 - remote work ( #127 )
...
* #120 - wip
* #120 - add icon to home office
* #120 - wip
* #120 - wip
* #120 - wip
* #120 - wip
* #120 - wip
* #120 - ui fixes
* #120 - fix
* #120 - fix
* #120 - fix
* #120 - fix
* #120 - translation fix
* #120 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-21 07:44:22 +02:00
Adrian Hopek
cc981b02b4
#90 - user profile ( #125 )
...
* fix css focuses
* #90 - wip
* #90 - fix to generate PDF
* #90 - wip
* #90 - wip
* #90 - wip
* #90 - wip
* #90 - fix to calendar
* #90 - wip
* #90 - fix
* #90 - fix lint
* #90 - fix
* Apply suggestions from code review
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* #90 - cr fixes
* #90 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-04-14 11:58:45 +02:00
Adrian Hopek
ff8d6aade6
#71 - annual summary ( #113 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* fix
* lint fix
* cr fix
* fix
2022-04-07 14:33:15 +02:00
Adrian Hopek
6af4380fe6
#108 - types of vacation request ( #110 )
...
* #108 - wip
* #108 - add icon to absence
* #108 - wip
* #108 - fix
* #108 - fix title
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-04-06 15:13:54 +02:00
Adrian Hopek
b49fcadbba
#99 - ui changes ( #100 )
...
* #99 - ui changes
* #99 - logo fix
* #99 - tailwind plugin for eslint
* #99 - fix
* #99 - fix
* #99 - fix pagination
* #99 - fix logo
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-31 10:12:33 +02:00
Adrian Hopek
08421b8a69
- small changes ( #98 )
...
* - added some test
* - cr fix
* wip
* wip
* Update resources/js/Shared/MainMenu.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
* fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-03-30 10:33:18 +02:00
Ewelina Lasowy
fdbc374d7e
#93 - custom error pages ( #94 )
...
* #93 - wip
* #93 - wip
* #93 - fix if statement
* #93 - wip
* #93 - added default error page
* #93 - fix to error page
* #93 - fix linter
* #93 - delete unnecessary file
* #93 - added EOL
* #93 - fix
* #93 - cr fix
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
2022-03-30 09:06:25 +02:00
Adrian Hopek
957b07b3eb
#44 - vacation summary of all employees ( #92 )
...
* #44 - ui for summary
* #44 - vacation monthly usage
* #44 - fix
* #44 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-24 10:33:34 +01:00
Adrian Hopek
dcda8c6255
- vue composition api ( #91 )
...
* wip
* fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-22 15:03:42 +01:00
Adrian Hopek
a0e60a3160
#74 - vacation calendar ( #87 )
...
* - polishing calendar
* wip
* wip
* #74 - wip
* #74 - wip
* #74 - wip
* #74 - fix icons
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-21 11:57:32 +01:00
Adrian Hopek
0076c04e88
#76 - fix menu active status ( #80 )
2022-03-16 11:53:16 +01:00
Adrian Hopek
db4be79c91
#62 - vacation request list for approvers ( #69 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* #5 - bump dependencies
* #43 - wip
* #43 - add composer script
* #43 - fix
* #43 - fix
* #43 - wip
* #43 - ecs fix
* #43 - cr fix
* #43 - cr fix
* #43 - fix
* #62 - wip
* #62 - wip
* #62 - wip
* #62 - fix
* #62 - fix
* #62 - fix
* #62 - fix
* #62 - fix
* #62 - ecs fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-08 09:25:24 +01:00
Adrian Hopek
3d9726039c
#43 - vacation summary for employee ( #66 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* #5 - bump dependencies
* #43 - wip
* #43 - add composer script
* #43 - fix
* #43 - fix
* #43 - wip
* #43 - ecs fix
* #43 - cr fix
* #43 - cr fix
* #43 - fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-03 09:03:17 +01:00
Adrian Hopek
d825dd727f
#63 - permissions ( #67 )
...
* wip
* fix
* wip
* #63 - permissions
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-03-02 09:52:50 +01:00
Adrian Hopek
10b5d0c37e
#58 - highlight active section in menu ( #59 )
...
* #58 - wip
* Update resources/js/Shared/MainMenu.vue
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
2022-02-22 13:46:09 +01:00
Ewelina Lasowy
77a4d5711c
#41 - email notifications ( #54 )
...
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #41 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #41 - wip
* #41 - wip
* #49 - laravel 9
* #41 - wip
* #41 - fix
* #41 - fix
* Apply suggestions from code review
Co-authored-by: Jacek Sawoszczuk <jacek.sawoszczuk@gmail.com>
* #41 - cr fix
* #41 - cr fix
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Jacek Sawoszczuk <jacek.sawoszczuk@gmail.com>
2022-02-21 13:19:59 +01:00
Ewelina Lasowy
f81c7ca8fa
#42 - global notifications ( #50 )
...
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #42 - wip
* #42 - wip
* #42 - fix
* #42 - wip
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
2022-02-16 08:43:12 +01:00
Adrian Hopek
6c352b629c
#22 - vacation calendar ( #51 )
...
* change layout
* change layout
* #22 - wip
* wip
* wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - added some tests
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - wip
* #22 - wip
* #22 - wip
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - fix
* #22 - cr fixes
* #22 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-02-15 15:08:26 +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
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
Adrian Hopek
e147d24365
#23 - collective editing vacation days ( #26 )
...
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - wip
* #23 - fix
* #23 - ecs fix
* #23 - fix
* #23 - fix
* #23 - cr fix
2022-01-24 11:28:00 +01:00
Adrian Hopek
9aa2d5ec0f
#4 - users CRUD ( #24 )
...
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #4- wip
* #4 - wip
* #4 - wip
* #4 - wip
* #4- wip
* #4 - wip
* #4 - wip
* #4 - tests
* #4 - ecs fix
* #4 - fix
* #4 - wip
* #4 - fix
* #4 - fix
* #4 - fix composer
* #4 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-01-19 10:55:10 +01:00
Ewelina Lasowy
91bd46cc36
#17 - set up Laravel Dusk ( #18 )
...
* #17 - set up Laravel Dusk
* #17 - ecs fix
* #17 - fix
* #17 - fix
* #17 - fix
* #17 - fix
* Update .env.dusk.local
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
2022-01-18 12:22:02 +01:00
Adrian Hopek
0869395aab
#2 - authentication via google ( #16 )
...
* #2 - wip
* #2 - wip
* #2 - ui fixes to login page
* #2 - fix
* #2 - fix
* #2 - add title to login page
* Apply suggestions from code review
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
* #2 - cr fix
* #2 - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
2022-01-13 14:19:11 +01:00
Adrian Hopek
e015f02892
#11 - basic layout ( #15 )
...
* #11 - basic layout
* #5 - bump dependencies
* #11 - fix
* #11 - fix
* #11 - fix logo
2022-01-12 14:18:25 +01:00
