EwelinaLasowy 
							
						 
					 
					
						
						
							
						
						7158e07920 
					 
					
						
						
							
							#134  - fixes  
						
						
						
						
					 
					
						2022-05-16 14:26:32 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						3d0f132cab 
					 
					
						
						
							
							translations  
						
						
						
						
					 
					
						2022-05-11 11:21:22 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						5dea3293c6 
					 
					
						
						
							
							missing empty lines  
						
						
						
						
					 
					
						2022-05-11 10:34:11 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						f50da3b79c 
					 
					
						
						
							
							lint fixes  
						
						
						
						
					 
					
						2022-05-11 09:12:43 +02:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						cba8199178 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-05-11 08:01:00 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						37d9404226 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-05-10 14:54:09 +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 
							
						 
					 
					
						
						
							
						
						928d3344c8 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/generate-cv' into generate-cv  
						
						... 
						
						
						
						# Conflicts:
#	resources/js/Pages/Resumes/Create.vue 
						
						
					 
					
						2022-05-10 08:04:07 +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 
							
						 
					 
					
						
						
							
						
						593f997403 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-05-06 12:23:04 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						47ad45cb73 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-05-06 09:00:46 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						911c54f9ab 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-04-29 15:07:19 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						06863b854a 
					 
					
						
						
							
							#138  - fix tables on safari ( #139 )  
						
						
						
						
					 
					
						2022-04-29 09:22:02 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						f35fd2960a 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-04-28 15:26:56 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						503c4e4629 
					 
					
						
						
							
							wip  
						
						
						
						
					 
					
						2022-04-28 15:26:35 +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 
							
						 
					 
					
						
						
							
						
						6b2556c1da 
					 
					
						
						
							
							#126  - vacation request reminders ( #130 )  
						
						... 
						
						
						
						* #126  - vacation request reminders
* #126  - fix workdays
* #126  - changes
* #126  - cs fix
* #5  - bump codestyle
* #126  - fix
* #126  - fix
* #126  - fix
* #126  - fix
* #126  - tests
* #126  - fix
* #126  - fix
* #126  - fix seeders
* #126  - fix
* #126  - tests
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl > 
						
						
					 
					
						2022-04-27 15:26:55 +02:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						c69866bb52 
					 
					
						
						
							
							#116  - integration with slack ( #129 )  
						
						... 
						
						
						
						* wip
* wip
* wip
* wip
* fix
* wip
* wip
* fix
* fix
* cs fix
* #116  - fix
* #116  - changed home-office icon
* Apply suggestions from code review
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com >
* #116  - cr fix
* #116  - cs fix
* #116  - cs fix
* Apply suggestions from code review
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com >
* #5  - bump codestyle
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-27 09:57:13 +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 
							
						 
					 
					
						
						
							
						
						4af0482a93 
					 
					
						
						
							
							#112  - change content of emails ( #114 )  
						
						... 
						
						
						
						* #112  - change content of emails
* #112  - wip 
						
						
					 
					
						2022-04-08 08:12:41 +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 
						 
				 
			
				
					
						
							
							
								Ewelina Lasowy 
							
						 
					 
					
						
						
							
						
						fa244b96cd 
					 
					
						
						
							
							- Change logo to svg ( #109 )  
						
						... 
						
						
						
						* - sidebar logo fix
* - change icon
* - change logo to svg
* #108  - change icon color 
						
						
					 
					
						2022-04-06 10:59:26 +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 
							
						 
					 
					
						
						
							
						
						720d2c4e7b 
					 
					
						
						
							
							#95  - unavailable days ( #96 )  
						
						... 
						
						
						
						* #95  - unavailable days
* #95  - fix
* #95  - fix 
						
						
					 
					
						2022-03-28 14:05:59 +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 
							
						 
					 
					
						
						
							
						
						95f5ed44d6 
					 
					
						
						
							
							- actions and notifications refactor ( #88 )  
						
						... 
						
						
						
						* wip
* fix
* fix
* fix
* add test
* fix
* wip
* fix
* fix translations
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl > 
						
						
					 
					
						2022-03-21 15:29:20 +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 
							
						 
					 
					
						
						
							
						
						8c1819aa01 
					 
					
						
						
							
							#85  - google calendar improvements ( #86 )  
						
						... 
						
						
						
						* google calendar improvements
* fix
* change vacation request name
* #85  - google calendar improvements
* #85  - fix
* #85  - fix
* #85  - fix 
						
						
					 
					
						2022-03-18 08:11:34 +01:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						afb1a5e9ff 
					 
					
						
						
							
							#73  - cancel vacation request ( #83 )  
						
						... 
						
						
						
						* #73  - cancel vacation request
* #73  - fix
* #73  - changed text for cancelling vacation request
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl > 
						
						
					 
					
						2022-03-17 09:33:29 +01:00 
						 
				 
			
				
					
						
							
							
								Ewelina Lasowy 
							
						 
					 
					
						
						
							
						
						43870fa060 
					 
					
						
						
							
							#72  - UX improvement ( #81 )  
						
						... 
						
						
						
						* #72  - UX improvement
* #72  - wip
* #72  - UX improvement fix
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl > 
						
						
					 
					
						2022-03-16 14:07:27 +01:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						0076c04e88 
					 
					
						
						
							
							#76  - fix menu active status ( #80 )  
						
						
						
						
					 
					
						2022-03-16 11:53:16 +01:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						8a54403318 
					 
					
						
						
							
							#77  - center Google "G" icon ( #78 )  
						
						
						
						
					 
					
						2022-03-16 09:10:24 +01:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						6d62c8b776 
					 
					
						
						
							
							#48  - heroku deployment ( #70 )  
						
						... 
						
						
						
						* test
* #48  - deployment
* #48  - fixes
* #48  - prod assets
* #48  - readme for heroku deployment
* #48  - fix
* #48  - ecs fix
* #48  - fix
* #48  - fix
* #48  - cr fix
* #48  - remove predis dependency 
						
						
					 
					
						2022-03-15 14:46:42 +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 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						17cdee38e0 
					 
					
						
						
							
							#38  - vacation request by administrative approver ( #57 )  
						
						... 
						
						
						
						* #38  - wip
* #38  - wip
* #38  - fix
* #38  - fix
* #38  - fix
* #38  - fix
* Update resources/lang/pl.json
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl >
* #38  - cr fix
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl >
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl > 
						
						
					 
					
						2022-02-22 11:02:36 +01:00 
						 
				 
			
				
					
						
							
							
								Adrian Hopek 
							
						 
					 
					
						
						
							
						
						39b464388c 
					 
					
						
						
							
							#39  - generate timesheet ( #56 )  
						
						... 
						
						
						
						* #39  - wip
* #39  - fix
* #39  - wip
* #39  - wip
* #39  - wip
* Update app/Domain/Enums/Month.php
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl >
* #39  - cr fixes
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl >
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl > 
						
						
					 
					
						2022-02-21 16:09:45 +01:00