Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								9234f74bec 
								
							 
						 
						
							
							
								
								Added accompanying frontend  
							
							
							
						 
						
							2021-07-23 20:19:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02dd0eb8e2 
								
							 
						 
						
							
							
								
								Merge pull request  #371  from Malte-D/feature/opt-in-booking  
							
							... 
							
							
							
							Feature/opt in booking 
							
						 
						
							2021-07-22 11:30:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								7098e75841 
								
							 
						 
						
							
							
								
								Fixes 404 issue with slug when trailing whitespaces exist  
							
							
							
						 
						
							2021-07-20 13:27:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								0c975cdcbc 
								
							 
						 
						
							
							
								
								fixed codacy issues  
							
							
							
						 
						
							2021-07-18 21:22:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								f5516ed427 
								
							 
						 
						
							
							
								
								added reminder emails for opt-in bookings  
							
							
							
						 
						
							2021-07-18 21:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								a2bf242c9e 
								
							 
						 
						
							
							
								
								opt in booking  
							
							
							
						 
						
							2021-07-18 20:28:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45689059c7 
								
							 
						 
						
							
							
								
								Feat/cal 95/date range on event types ( #353 )  
							
							... 
							
							
							
							* add edit links to events on dashboard
* fit elements on screen for mobile
* initialize components for consistent text styles
* add more fine grained width/height settings
* add higher level setting for when an event is available
- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available
* fix issue where periodDates are null
* return minimal required data, handle date parsing
* [ui] limit booking days based on user period settings
* api: validate user period settings
* [db] migration for event type period settings 
							
						 
						
							2021-07-15 09:10:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								4d7427ad91 
								
							 
						 
						
							
							
								
								Fixes some linting + codacy issues  
							
							
							
						 
						
							2021-07-11 19:43:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								5206fb4f88 
								
							 
						 
						
							
							
								
								Implemented theme through user preferences  
							
							
							
						 
						
							2021-07-09 23:13:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36b258f4b7 
								
							 
						 
						
							
							
								
								safely check user availability ( #352 )  
							
							
							
						 
						
							2021-07-09 10:55:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c4a9c32d1 
								
							 
						 
						
							
							
								
								Add application logger ( #332 )  
							
							... 
							
							
							
							* add application logger
* use logger 
							
						 
						
							2021-07-09 10:49:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f73997e72 
								
							 
						 
						
							
							
								
								safely check isAvailable ( #331 )  
							
							... 
							
							
							
							fix issue where checking availability throws an error 
							
						 
						
							2021-07-07 11:53:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								3c09837104 
								
							 
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							2021-07-07 12:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad00e5fc0c 
								
							 
						 
						
							
							
								
								Merge pull request  #333  from mihaic195/fix/teams-create-error-and-unauthenticated-request  
							
							... 
							
							
							
							Team API error and page 
							
						 
						
							2021-07-07 10:56:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								43f899582f 
								
							 
						 
						
							
							
								
								Fix issue where user ID is not fetched  
							
							
							
						 
						
							2021-07-06 22:09:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e315b272f5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request  
							
							
							
						 
						
							2021-07-05 10:18:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6463b3ba37 
								
							 
						 
						
							
							
								
								fix codacy suggestions  
							
							
							
						 
						
							2021-07-01 12:47:12 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e10030e18b 
								
							 
						 
						
							
							
								
								fix api 500 and redirect to login if not authenticated when accessing /settings/team  
							
							
							
						 
						
							2021-06-30 16:48:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								8c589b9dc1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-30 01:45:24 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								575747bcd3 
								
							 
						 
						
							
							
								
								Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul.  
							
							
							
						 
						
							2021-06-29 01:45:58 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								7030851efb 
								
							 
						 
						
							
							
								
								Merged with main, fixed issue that caused multiple AvailableTimes refreshes.  
							
							
							
						 
						
							2021-06-27 21:34:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								b5b480f7e2 
								
							 
						 
						
							
							
								
								hotfix for booking  
							
							
							
						 
						
							2021-06-26 19:48:24 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								a53cdf2660 
								
							 
						 
						
							
							
								
								fix: issue where user could book a meeting when unavailable  
							
							
							
						 
						
							2021-06-24 16:21:25 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								1dce84fa8f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-22 15:19:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								0ea36cb3f8 
								
							 
						 
						
							
							
								
								added edit/remove for customEventTypeInputs  
							
							
							
						 
						
							2021-06-22 17:10:52 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								b2812deeff 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-21 20:37:19 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9b75b90ba 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/custom-fields-on-the-booking-page  
							
							
							
						 
						
							2021-06-21 11:35:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								931e6b26f1 
								
							 
						 
						
							
							
								
								error handling WIP  
							
							
							
						 
						
							2021-06-20 21:02:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								f99729c392 
								
							 
						 
						
							
							
								
								Merged with main  
							
							
							
						 
						
							2021-06-20 17:52:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								ebc42f0c96 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/zoom-integration  
							
							... 
							
							
							
							# Conflicts:
#	lib/calendarClient.ts
#	lib/emails/new-event.ts
#	pages/[user]/book.tsx
#	pages/api/availability/[user].ts
#	pages/api/book/[user].ts
#	pages/integrations/index.tsx 
							
						 
						
							2021-06-20 16:37:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								543482ca52 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/custom-fields-on-the-booking-page  
							
							... 
							
							
							
							# Conflicts:
#	pages/api/availability/eventtype.ts
#	pages/availability/event/[type].tsx 
							
						 
						
							2021-06-19 20:47:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								95a99c620e 
								
							 
						 
						
							
							
								
								selected calendars hotfix  
							
							
							
						 
						
							2021-06-18 22:11:13 +02:00