Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e9b75b90ba
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/custom-fields-on-the-booking-page
							
							
							
							
							
						 | 
						
							2021-06-21 11:35:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								9007bbed29
								
							
						 | 
						
							
							
								
								Added links to iCal again
							
							
							
							
							
						 | 
						
							2021-06-20 17:04:00 +02: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								653509d655
								
							
						 | 
						
							
							
								
								formatting cleanup
							
							
							
							
							
						 | 
						
							2021-06-19 21:51:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								639341f701
								
							
						 | 
						
							
							
								
								show custom inputs on booking screen
							
							
							
							
							
						 | 
						
							2021-06-19 21:44:36 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								76b72f64d8
								
							
						 | 
						
							
							
								
								event type custom input WIP
							
							
							
							
							
						 | 
						
							2021-06-18 21:58:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								81246edab2
								
							
						 | 
						
							
							
								
								Merge pull request #268 from emrysal/hotfix/ics-month-error
							
							
							
							
							
							
							
							Fixes #266: ICS event is off by one month 
							
						 | 
						
							2021-06-18 17:04:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								90c1ff25bf
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/customise-event-names
							
							
							
							
							
						 | 
						
							2021-06-18 17:00:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2466440f9
								
							
						 | 
						
							
							
								
								removed debug logging
							
							
							
							
							
						 | 
						
							2021-06-18 14:03:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								c662c97d14
								
							
						 | 
						
							
							
								
								Refactored EventOwner to EventOrganizer
							
							
							
							
							
						 | 
						
							2021-06-18 02:44:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								869ba9b97c
								
							
						 | 
						
							
							
								
								Implemented reschedule mail and fixed bug that rescheduling weren't saved
							
							
							
							
							
						 | 
						
							2021-06-17 02:44:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								a11641d7b9
								
							
						 | 
						
							
							
								
								Implemented common availability
							
							
							
							
							
						 | 
						
							2021-06-17 01:41:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b4cf088c0
								
							
						 | 
						
							
							
								
								Added line break
							
							
							
							
							
						 | 
						
							2021-06-17 00:57:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								f56ced0ff1
								
							
						 | 
						
							
							
								
								Re-implemented event confirmation mails object based
							
							
							
							
							
						 | 
						
							2021-06-17 00:56:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								04e0b55b51
								
							
						 | 
						
							
							
								
								Introduced more classes for event mails
							
							
							
							
							
						 | 
						
							2021-06-17 00:26:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								e37dd017c8
								
							
						 | 
						
							
							
								
								Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations
							
							
							
							
							
						 | 
						
							2021-06-16 23:40:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								51a8bafaa7
								
							
						 | 
						
							
							
								
								Full zoom integration (except availability check)
							
							
							
							
							
						 | 
						
							2021-06-16 22:14:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								4fb0fbfe07
								
							
						 | 
						
							
							
								
								Made event name customizable
							
							
							
							
							
						 | 
						
							2021-06-15 17:26:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								dbd1721405
								
							
						 | 
						
							
							
								
								Fixes #266: ICS event is off by one month
							
							
							
							
							
						 | 
						
							2021-06-14 19:00:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad69feed70
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/select-calendars-to-check-for-availability
							
							
							
							
							
						 | 
						
							2021-06-14 20:13:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3b8431699
								
							
						 | 
						
							
							
								
								Implemented calendar selection for availability checking.
							
							
							
							
							
							
							
							Also upgraded outlook integration to be able to check all calendars instead of only the default one. 
							
						 | 
						
							2021-06-14 19:45:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ff8e9bd00
								
							
						 | 
						
							
							
								
								Calculate proper duration
							
							
							
							
							
						 | 
						
							2021-06-14 19:18:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cf00043b1
								
							
						 | 
						
							
							
								
								Persist new refresh token
							
							
							
							
							
						 | 
						
							2021-06-14 18:13:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ecb7f22e3
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/zoom-integration
							
							
							
							
							
						 | 
						
							2021-06-14 17:17:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								31670d37b8
								
							
						 | 
						
							
							
								
								Fixed api urls and env variable names
							
							
							
							
							
						 | 
						
							2021-06-13 16:18:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc8c58e57c
								
							
						 | 
						
							
							
								
								Fixed integration identifier
							
							
							
							
							
						 | 
						
							2021-06-13 16:07:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cf7ffd6a7
								
							
						 | 
						
							
							
								
								First test implementation of video client
							
							
							
							
							
						 | 
						
							2021-06-13 15:22:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bb4678bf7
								
							
						 | 
						
							
							
								
								Added subtitle to zoom integrations
							
							
							
							
							
						 | 
						
							2021-06-13 13:59:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								124086d1ca
								
							
						 | 
						
							
							
								
								Added zoom to list
							
							
							
							
							
						 | 
						
							2021-06-13 01:24:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								8227e733e6
								
							
						 | 
						
							
							
								
								Append reschedule/cancel also to event description
							
							
							
							
							
						 | 
						
							2021-06-13 00:37:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								65c7960b76
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/invite-external-users
							
							
							
							
							
						 | 
						
							2021-06-11 22:02:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								96d4a9bd6d
								
							
						 | 
						
							
							
								
								Set Reply-To header to allow replying to bookings
							
							
							
							
							
						 | 
						
							2021-06-10 18:04:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d4222c631
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/cancel-reschedule-links
							
							
							
							
							
						 | 
						
							2021-06-10 08:33:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								abae62f30e
								
							
						 | 
						
							
							
								
								Removed sha256
							
							
							
							
							
						 | 
						
							2021-06-10 01:14:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								40eb9036f4
								
							
						 | 
						
							
							
								
								Implements inviting external users to teams
							
							
							
							
							
						 | 
						
							2021-06-09 21:43:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								749427cab3
								
							
						 | 
						
							
							
								
								Fixed update method
							
							
							
							
							
						 | 
						
							2021-06-09 22:04:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e338aaa05
								
							
						 | 
						
							
							
								
								Fixed update method
							
							
							
							
							
						 | 
						
							2021-06-09 22:03:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd1cb474c5
								
							
						 | 
						
							
							
								
								Fixed update call
							
							
							
							
							
						 | 
						
							2021-06-09 21:59:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9d1dd1059
								
							
						 | 
						
							
							
								
								Potentially working update method for google calendar
							
							
							
							
							
						 | 
						
							2021-06-09 21:47:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								403823fc62
								
							
						 | 
						
							
							
								
								change event for outlook implemented
							
							
							
							
							
						 | 
						
							2021-06-09 21:22:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								72a07770e8
								
							
						 | 
						
							
							
								
								Implemented link generation in mails
							
							
							
							
							
						 | 
						
							2021-06-08 17:24:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3a4a65a80
								
							
						 | 
						
							
							
								
								Successfully implemented deletion
							
							
							
							
							
						 | 
						
							2021-06-08 02:25:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								7df41b519f
								
							
						 | 
						
							
							
								
								Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email
							
							
							
							
							
						 | 
						
							2021-06-07 16:57:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c7322b0dc
								
							
						 | 
						
							
							
								
								Send mails to all users
							
							
							
							
							
						 | 
						
							2021-06-07 09:24:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e306ef1b0
								
							
						 | 
						
							
							
								
								Use calendar deletion
							
							
							
							
							
						 | 
						
							2021-06-07 08:59:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								b376e9e5a4
								
							
						 | 
						
							
							
								
								Prepared google calendar deletion
							
							
							
							
							
						 | 
						
							2021-06-07 01:10:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								d05ae49e8d
								
							
						 | 
						
							
							
								
								Made UID unique, implemented cancel API, Prepared mail footer,
							
							
							
							
							
						 | 
						
							2021-06-06 03:51:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec7a84ce22
								
							
						 | 
						
							
							
								
								Implemented request handler and error handling in frontend and added cancellation event to telemetry
							
							
							
							
							
						 | 
						
							2021-06-06 03:12:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5e750eae7
								
							
						 | 
						
							
							
								
								Implemented SHA256 hash helper function
							
							
							
							
							
						 | 
						
							2021-06-06 01:29:27 +02:00 | 
						
						
							
							
							
								
							
							
						 |