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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								01fc00b92f 
								
							 
						 
						
							
							
								
								added darkmode classs to ¢[type] and /book  
							
							
							
						 
						
							2021-07-07 21:58:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								3c09837104 
								
							 
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							2021-07-07 12:43:13 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								51c0556d30 
								
							 
						 
						
							
							
								
								Hide Calendso branding  
							
							
							
						 
						
							2021-06-29 17:08:55 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								9c3eea5257 
								
							 
						 
						
							
							
								
								booking hotfix  
							
							
							
						 
						
							2021-06-24 20:41:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								917b2c4821 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/refresh-tokens-and-error-handling  
							
							
							
						 
						
							2021-06-24 18:03:54 +02: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								78451a98b1 
								
							 
						 
						
							
							
								
								Updated timeFormat to something more sensible  
							
							
							
						 
						
							2021-06-22 14:25:01 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								b423f2894a 
								
							 
						 
						
							
							
								
								WIP to save progress  
							
							
							
						 
						
							2021-06-19 22:50:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc5efd6ee 
								
							 
						 
						
							
							
								
								fixed additional notes  
							
							
							
						 
						
							2021-06-19 21:54:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								639341f701 
								
							 
						 
						
							
							
								
								show custom inputs on booking screen  
							
							
							
						 
						
							2021-06-19 21:44:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								ad0b561cca 
								
							 
						 
						
							
							
								
								fix: eventType not defined on [user]/[type]  
							
							
							
						 
						
							2021-06-19 10:17:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1b3fa7dd 
								
							 
						 
						
							
							
								
								Return 404 when requesting event url that does not exist  
							
							
							
						 
						
							2021-06-18 20:41:12 +00:00