Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b71cc82a0e 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:30:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								769f36f8d5 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:30:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b91d021fc8 
								
							 
						 
						
							
							
								
								Update pages/api/teams.ts  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:29:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1122def2c0 
								
							 
						 
						
							
							
								
								update fetch to also handle errors  
							
							
							
						 
						
							2021-07-01 11:47:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b00475b27 
								
							 
						 
						
							
							
								
								remove unnecessary guard  
							
							
							
						 
						
							2021-06-30 16:52:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e10030e18b 
								
							 
						 
						
							
							
								
								fix api 500 and redirect to login if not authenticated when accessing /settings/team  
							
							
							
						 
						
							2021-06-30 16:48:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3aa1e1716d 
								
							 
						 
						
							
							
								
								Merge pull request  #327  from Malte-D/hotfix/book-user  
							
							... 
							
							
							
							hotfix for api/book/user 
							
						 
						
							2021-06-29 17:20:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								dfb9870894 
								
							 
						 
						
							
							
								
								hotfix  
							
							
							
						 
						
							2021-06-29 18:17:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								51c0556d30 
								
							 
						 
						
							
							
								
								Hide Calendso branding  
							
							
							
						 
						
							2021-06-29 17:08:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								099186fdd9 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/zoom-invalid-token  
							
							
							
						 
						
							2021-06-29 16:19:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								113185e089 
								
							 
						 
						
							
							
								
								Merge pull request  #323  from mihaic195/fix/add-login-link-on-forgot-password-page  
							
							
							
						 
						
							2021-06-29 09:50:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39df7d61bc 
								
							 
						 
						
							
							
								
								fix: add login link on forgot password page  
							
							
							
						 
						
							2021-06-29 11:45:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								d1bdac45eb 
								
							 
						 
						
							
							
								
								dont allow user to book a past date  
							
							
							
						 
						
							2021-06-28 19:39:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								f918f220eb 
								
							 
						 
						
							
							
								
								Fixed Zoom Auth  
							
							
							
						 
						
							2021-06-29 02:21:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								383ec64a7f 
								
							 
						 
						
							
							
								
								onChange callback got removed in eslint cleanups  
							
							... 
							
							
							
							Triggered eslint:no-empty-function, this PR circumvents this by adding
a comment as part of the function body. 
							
						 
						
							2021-06-27 13:51:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								b5b480f7e2 
								
							 
						 
						
							
							
								
								hotfix for booking  
							
							
							
						 
						
							2021-06-26 19:48:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa2e35d68e 
								
							 
						 
						
							
							
								
								Merge pull request  #311  from Nico-J/feature/zoom-event-location  
							
							... 
							
							
							
							Added zoom as an event location and fixed linting 
							
						 
						
							2021-06-25 16:52:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8394b12a71 
								
							 
						 
						
							
							
								
								Merge pull request  #307  from femyeda/feat/cal-69/password-reset  
							
							... 
							
							
							
							Feat/cal 69/password reset 
							
						 
						
							2021-06-25 16:52:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc02558ac6 
								
							 
						 
						
							
							
								
								Merge pull request  #310  from femyeda/fix-244-can-book-when-not-available  
							
							... 
							
							
							
							Fix 244 can book when not available 
							
						 
						
							2021-06-25 16:51:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								e883ab591a 
								
							 
						 
						
							
							
								
								simplify expiry calculation, timezone unneccessary  
							
							
							
						 
						
							2021-06-25 09:23:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								6fec24a69d 
								
							 
						 
						
							
							
								
								use lib folder  
							
							
							
						 
						
							2021-06-25 09:21:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								ad657c0261 
								
							 
						 
						
							
							
								
								use proper response code  
							
							
							
						 
						
							2021-06-25 09:17:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								2c29368337 
								
							 
						 
						
							
							
								
								fix: passwordResetLink uses correct page  
							
							
							
						 
						
							2021-06-25 09:16:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								bc47975316 
								
							 
						 
						
							
							
								
								Added zoom as an event location and fixed ESLint  
							
							
							
						 
						
							2021-06-25 00:26:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								a53cdf2660 
								
							 
						 
						
							
							
								
								fix: issue where user could book a meeting when unavailable  
							
							
							
						 
						
							2021-06-24 16:21:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								9c3eea5257 
								
							 
						 
						
							
							
								
								booking hotfix  
							
							
							
						 
						
							2021-06-24 20:41:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								646ff4a107 
								
							 
						 
						
							
							
								
								eslint fixes  
							
							
							
						 
						
							2021-06-24 18:12:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								917b2c4821 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/refresh-tokens-and-error-handling  
							
							
							
						 
						
							2021-06-24 18:03:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								ab1298e2ca 
								
							 
						 
						
							
							
								
								Allow user to reset password  
							
							
							
						 
						
							2021-06-24 11:01:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								ea5692c20c 
								
							 
						 
						
							
							
								
								Add bookings page  
							
							
							
						 
						
							2021-06-24 11:01:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								ebb3e87284 
								
							 
						 
						
							
							
								
								Add bookings page  
							
							
							
						 
						
							2021-06-24 14:36:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								1668785678 
								
							 
						 
						
							
							
								
								Prevent users from entering mixed case usernames  
							
							... 
							
							
							
							Booking pages are case insensitive new, so no more case sensitive
usernames. 
							
						 
						
							2021-06-23 16:10:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								afa2e19f03 
								
							 
						 
						
							
							
								
								added more meta data to booking page  
							
							
							
						 
						
							2021-06-23 12:14:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								629a34262e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/lowercase-usernames  
							
							
							
						 
						
							2021-06-23 11:29:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c428c3f80e 
								
							 
						 
						
							
							
								
								Merge pull request  #300  from Malte-D/feature/og-image  
							
							... 
							
							
							
							Added og-image to booking pages 
							
						 
						
							2021-06-22 19:24:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								0e27e7e3d9 
								
							 
						 
						
							
							
								
								changed og-image link  
							
							
							
						 
						
							2021-06-22 20:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								892ba8a335 
								
							 
						 
						
							
							
								
								Lowercase the router.query.user & some typescript fixes  
							
							
							
						 
						
							2021-06-22 17:42:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								e4b977c001 
								
							 
						 
						
							
							
								
								fix for single quotes  
							
							
							
						 
						
							2021-06-22 18:01:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								a3b4cbeadd 
								
							 
						 
						
							
							
								
								use  https://github.com/calendso/og-image  to show dynamic og-image of booking links with avatar and title of booking.  
							
							
							
						 
						
							2021-06-22 17:52:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c6d262184 
								
							 
						 
						
							
							
								
								Merge pull request  #299  from Malte-D/bugfix/edit-custom-inputs  
							
							... 
							
							
							
							added edit/remove for customEventTypeInputs 
							
						 
						
							2021-06-22 16:15:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								0ea36cb3f8 
								
							 
						 
						
							
							
								
								added edit/remove for customEventTypeInputs  
							
							
							
						 
						
							2021-06-22 17:10:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								78451a98b1 
								
							 
						 
						
							
							
								
								Updated timeFormat to something more sensible  
							
							
							
						 
						
							2021-06-22 14:25:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								a486d1eb02 
								
							 
						 
						
							
							
								
								Add some extra states  
							
							
							
						 
						
							2021-06-22 15:05:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c8d2c74de 
								
							 
						 
						
							
							
								
								Merge pull request  #292  from emrysal/feature/decrease-conflicts-booking-page-by-component-splitting  
							
							... 
							
							
							
							Added <AvailableTimes /> and <TimeOptions /> components 
							
						 
						
							2021-06-22 09:24:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7690350124 
								
							 
						 
						
							
							
								
								feat: allow users to set google meet as a location for events ( #287 )  
							
							... 
							
							
							
							* feat: allow users to set google meet as a location for events
- add google meet location with support for other integrations
* return location types from server
also avoids potential leaks of user credentials
* chore: remove unused variable
* fix: return minimal required data from server 
							
						 
						
							2021-06-21 18:15:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								22a009edd2 
								
							 
						 
						
							
							
								
								fixes after merge  
							
							
							
						 
						
							2021-06-21 18:15:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								88ab985ac4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/refresh-tokens-and-error-handling  
							
							... 
							
							
							
							# Conflicts:
#	lib/calendarClient.ts
#	pages/[user]/[type].tsx
#	pages/[user]/book.tsx
#	pages/api/book/[user].ts 
							
						 
						
							2021-06-21 17:56:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								f2265fdbd7 
								
							 
						 
						
							
							
								
								Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""  
							
							... 
							
							
							
							This reverts commit de4c8f75e0 
							
						 
						
							2021-06-21 07:31:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								88fc22ddd4 
								
							 
						 
						
							
							
								
								Updated to latest  
							
							
							
						 
						
							2021-06-21 10:39:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9b75b90ba 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/custom-fields-on-the-booking-page  
							
							
							
						 
						
							2021-06-21 11:35:59 +01:00