Adrian Hopek
							
						 
					 | 
					
						
						
							
						
						753d4bb296
					 | 
					
						
						
							
							#22 - wip
						
						
						
						
						
						
					 | 
					
						2022-02-08 13:46:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								EwelinaLasowy
							
						 
					 | 
					
						
						
							
						
						bbb0eb8f6c
					 | 
					
						
						
							
							change layout
						
						
						
						
						
						
					 | 
					
						2022-01-27 11:05:50 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |