Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								0eb7cea1e1 
								
							 
						 
						
							
							
								
								fixed integration CTA  
							
							
							
						 
						
							2021-08-02 18:38:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								d08b4ba0f3 
								
							 
						 
						
							
							
								
								changed colors of password reset  
							
							
							
						 
						
							2021-08-02 18:32:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								aaa86888db 
								
							 
						 
						
							
							
								
								added create account link for hosted  
							
							
							
						 
						
							2021-08-02 18:31:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								60b9f7ee15 
								
							 
						 
						
							
							
								
								replaced logo at login  
							
							
							
						 
						
							2021-08-02 18:30:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								4c2b8f5b6f 
								
							 
						 
						
							
							
								
								styled teams section  
							
							
							
						 
						
							2021-08-02 17:36:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								bd7443017a 
								
							 
						 
						
							
							
								
								fixed layout for react-select  
							
							
							
						 
						
							2021-08-02 17:24:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								64961cada1 
								
							 
						 
						
							
							
								
								added bottom nav, replaced png with svg integration icons, added subtitle to shell component  
							
							
							
						 
						
							2021-08-02 16:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								e734b5f5de 
								
							 
						 
						
							
							
								
								Entering Title autogenerates Slug  
							
							
							
						 
						
							2021-08-02 12:42:46 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a53d7f29 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-08-01 22:59:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								a608f94590 
								
							 
						 
						
							
							
								
								Initial restyling  
							
							
							
						 
						
							2021-07-31 00:05:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								062b92be29 
								
							 
						 
						
							
							
								
								fixed overflow bug on long booking items  
							
							
							
						 
						
							2021-07-30 11:53:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								bd28636af5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-07-28 22:01:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								18c96afc2b 
								
							 
						 
						
							
							
								
								Double fix for o365/outlook buttons  
							
							
							
						 
						
							2021-07-28 12:28:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f6edd06f85 
								
							 
						 
						
							
							
								
								Merge pull request  #389  from emrysal/bugfix/office365-weird-behaviour-non-utc  
							
							... 
							
							
							
							Updated office365 button to UTC 
							
						 
						
							2021-07-28 08:57:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								ad8cc4e985 
								
							 
						 
						
							
							
								
								Updated office365 button to UTC  
							
							
							
						 
						
							2021-07-27 23:17:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								d3569978f5 
								
							 
						 
						
							
							
								
								added dark mode classes for custom input fields  
							
							
							
						 
						
							2021-07-26 22:08:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								65fd733751 
								
							 
						 
						
							
							
								
								Use optional udi  
							
							
							
						 
						
							2021-07-25 17:08:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								4fb8e8285e 
								
							 
						 
						
							
							
								
								Added location to event  
							
							
							
						 
						
							2021-07-25 16:29:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								df161d5498 
								
							 
						 
						
							
							
								
								Added location to bookings table  
							
							
							
						 
						
							2021-07-25 14:37:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								a97862d4b8 
								
							 
						 
						
							
							
								
								Process event location in EventManager  
							
							
							
						 
						
							2021-07-25 14:19:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								86e2add30f 
								
							 
						 
						
							
							
								
								Resolved conflicts; included reference creation into EventManager; use EventManager everywhere  
							
							
							
						 
						
							2021-07-24 22:24:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								9234f74bec 
								
							 
						 
						
							
							
								
								Added accompanying frontend  
							
							
							
						 
						
							2021-07-23 20:19:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								4368ad0289 
								
							 
						 
						
							
							
								
								Implement minimum booking notice  
							
							
							
						 
						
							2021-07-22 22:52:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pedro Duarte 
								
							 
						 
						
							
							
							
							
								
							
							
								c745416a6a 
								
							 
						 
						
							
							
								
								Make collapsible time options accessible to screen readers  
							
							
							
						 
						
							2021-07-22 14:16:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								394be8612b 
								
							 
						 
						
							
							
								
								fix: settings page was missing value prop and restyled dark theme elements on booking page  
							
							
							
						 
						
							2021-07-22 15:16:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								e6790281b6 
								
							 
						 
						
							
							
								
								Fix embed URLs to use BASE_URL  
							
							
							
						 
						
							2021-07-22 12:04:15 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								e0abbbb2f1 
								
							 
						 
						
							
							
								
								Fixed linting errors  
							
							
							
						 
						
							2021-07-20 20:18:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								7aff32fb50 
								
							 
						 
						
							
							
								
								Only send single mail when booking zoom  
							
							
							
						 
						
							2021-07-20 20:07:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								7098e75841 
								
							 
						 
						
							
							
								
								Fixes 404 issue with slug when trailing whitespaces exist  
							
							
							
						 
						
							2021-07-20 13:27:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								9375f337d7 
								
							 
						 
						
							
							
								
								Fix Codacy issues  
							
							
							
						 
						
							2021-07-19 16:56:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								a40a5c04fe 
								
							 
						 
						
							
							
								
								Retain rescheduleUid when picking a date  
							
							
							
						 
						
							2021-07-18 22:17:18 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								81e1287693 
								
							 
						 
						
							
							
								
								Fixed cancellation  
							
							
							
						 
						
							2021-07-18 16:03:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								270e6b2d4f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-07-18 15:12:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								b4ed8ae87e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-07-18 15:12:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								87f9f83643 
								
							 
						 
						
							
							
								
								Fix broken event types card on dashboard  
							
							
							
						 
						
							2021-07-17 11:39:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								b146b80778 
								
							 
						 
						
							
							
								
								Fixed signature  
							
							
							
						 
						
							2021-07-15 23:34:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b27ba5123c 
								
							 
						 
						
							
							
								
								fix: stats, layout defect from merge ( #367 )  
							
							
							
						 
						
							2021-07-15 09:48:02 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								daecc1e0e4 
								
							 
						 
						
							
							
								
								Created EventManager in order to unify event CRUD logic  
							
							
							
						 
						
							2021-07-15 03:19:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Zaitsev 
								
							 
						 
						
							
							
							
							
								
							
							
								1dadf9f9a6 
								
							 
						 
						
							
							
								
								fix: same problem on the availability page  
							
							
							
						 
						
							2021-07-14 14:19:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Zaitsev 
								
							 
						 
						
							
							
							
							
								
							
							
								cb3c23e9b0 
								
							 
						 
						
							
							
								
								fix: truncate event type description instead of title  
							
							
							
						 
						
							2021-07-14 12:58:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793351fe96 
								
							 
						 
						
							
							
								
								[cal-184] add and handle date query params for event types ( #359 )  
							
							
							
						 
						
							2021-07-13 11:10:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6ed9bfde7b 
								
							 
						 
						
							
							
								
								Merge pull request  #354  from emrysal/feature/user-theme  
							
							... 
							
							
							
							Implemented theme through user preferences 
							
						 
						
							2021-07-12 14:01:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								4d7427ad91 
								
							 
						 
						
							
							
								
								Fixes some linting + codacy issues  
							
							
							
						 
						
							2021-07-11 19:43:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								3283eb422c 
								
							 
						 
						
							
							
								
								Fixed a bug that selected the following day on the booking page, when the selected time is smaller than the utc offset of the current timezone. Also fixed the reloading of the last 24h/12h selection  
							
							
							
						 
						
							2021-07-11 18:05:49 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a9b45c1057 
								
							 
						 
						
							
							
								
								Merge pull request  #351  from calendso/darkmode  
							
							... 
							
							
							
							hotfix: added dark mode for profile page 
							
						 
						
							2021-07-09 14:14:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								bf85cff76d 
								
							 
						 
						
							
							
								
								added dark mode for profile page  
							
							
							
						 
						
							2021-07-09 13:34:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c02c69073d 
								
							 
						 
						
							
							
								
								Merge pull request  #346  from calendso/darkmode  
							
							... 
							
							
							
							added darkmode classes to [type] and /book and dashboard 
							
						 
						
							2021-07-09 11:46:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								be102b1b09 
								
							 
						 
						
							
							
								
								Fixes   #347  & some other minor things when timezones differ  
							
							
							
						 
						
							2021-07-08 21:14:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								ffd99d02bb 
								
							 
						 
						
							
							
								
								Implement whereAndSelect decorator  
							
							
							
						 
						
							2021-07-08 20:44:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								db7c467d73 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://github.com/calendso/calendso  into main  
							
							
							
						 
						
							2021-07-08 10:23:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								5c699f8471 
								
							 
						 
						
							
							
								
								Add troubleshoot page & add loading spinners  
							
							
							
						 
						
							2021-07-08 10:23:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								01fc00b92f 
								
							 
						 
						
							
							
								
								added darkmode classs to ¢[type] and /book  
							
							
							
						 
						
							2021-07-07 21:58:18 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								749978798b 
								
							 
						 
						
							
							
								
								fixed layout for confirmation screen on mobile  
							
							
							
						 
						
							2021-07-03 22:27:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								b61cdbf40c 
								
							 
						 
						
							
							
								
								removed top margin and shadow for mobile layout  
							
							
							
						 
						
							2021-07-03 22:19:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								b136941948 
								
							 
						 
						
							
							
								
								Fixes   #337 : Event times ordered seemingly random  
							
							
							
						 
						
							2021-07-03 14:24:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcf2744566 
								
							 
						 
						
							
							
								
								Update pages/_app.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-02 13:32:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b15ef1d8b0 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-02 13:32:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2af9ed55a7 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-02 13:32:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8500a8dd64 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-02 13:31:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2008ad263c 
								
							 
						 
						
							
							
								
								fix: ssr session on teams page  
							
							
							
						 
						
							2021-07-02 13:28:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d701d3905d 
								
							 
						 
						
							
							
								
								Merge pull request  #293  from emrysal/feature/scheduling  
							
							... 
							
							
							
							Feature/scheduling 
							
						 
						
							2021-07-01 13:52:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f64df3e75 
								
							 
						 
						
							
							
								
								lint  
							
							
							
						 
						
							2021-07-01 12:51:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6463b3ba37 
								
							 
						 
						
							
							
								
								fix codacy suggestions  
							
							
							
						 
						
							2021-07-01 12:47:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								715033f4e1 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:31:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9eff620ee0 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:30:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a1e8cfbf7 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:30:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mihai C 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0fb2984138 
								
							 
						 
						
							
							
								
								Update pages/settings/teams.tsx  
							
							... 
							
							
							
							Co-authored-by: Bailey Pumfleet <pumfleet@hey.com> 
							
						 
						
							2021-07-01 12:30:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa8df7fcf 
								
							 
						 
						
							
							
								
								If no availability set, default to user prefs  
							
							
							
						 
						
							2021-06-30 15:57:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								a28cb455f1 
								
							 
						 
						
							
							
								
								Fixed bug that kept the date enabled when the time slot was less than 30m  
							
							
							
						 
						
							2021-06-30 15:41:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								80898ea706 
								
							 
						 
						
							
							
								
								Revamp bookings page  
							
							
							
						 
						
							2021-06-30 15:14:10 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								8c589b9dc1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-30 01:45:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								e78a34e2ce 
								
							 
						 
						
							
							
								
								Implements slot logic with the DatePicker, more tests for slots  
							
							
							
						 
						
							2021-06-30 01:35:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								5d30586a24 
								
							 
						 
						
							
							
								
								Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal  
							
							
							
						 
						
							2021-06-29 22:00:25 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								b4272ad7aa 
								
							 
						 
						
							
							
								
								Merge branch 'main' of github.com:calendso/calendso into feature/scheduling  
							
							
							
						 
						
							2021-06-28 19:53:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								1eba242820 
								
							 
						 
						
							
							
								
								Compare busyTimes in UTC, re-implement hasErrors  
							
							
							
						 
						
							2021-06-27 22:30:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								7030851efb 
								
							 
						 
						
							
							
								
								Merged with main, fixed issue that caused multiple AvailableTimes refreshes.  
							
							
							
						 
						
							2021-06-27 21:34:38 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								28edb86c14 
								
							 
						 
						
							
							
								
								Don't render location if there is none for now  
							
							
							
						 
						
							2021-06-24 22:48:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								bc47975316 
								
							 
						 
						
							
							
								
								Added zoom as an event location and fixed ESLint  
							
							
							
						 
						
							2021-06-25 00:26:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								ef3274d8f3 
								
							 
						 
						
							
							
								
								Working version ready for testing  
							
							... 
							
							
							
							* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account
TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code 
							
						 
						
							2021-06-24 22:15:18 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								1dce84fa8f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-22 15:19:28 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								b2812deeff 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/scheduling  
							
							
							
						 
						
							2021-06-21 20:37:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								b50fe16566 
								
							 
						 
						
							
							
								
								Moved DatePicker and PoweredByCalendso to seperate components  
							
							
							
						 
						
							2021-06-21 20:26:04 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								a463fded8f 
								
							 
						 
						
							
							
								
								Added <AvailableTimes /> and <TimeOptions /> components  
							
							
							
						 
						
							2021-06-20 14:19:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								d904dd7a00 
								
							 
						 
						
							
							
								
								AvailableTimes refactor complete, it all seems much simpler now  
							
							
							
						 
						
							2021-06-20 00:10:08 +00:00