| 
								
								
									 Bailey Pumfleet | e9b75b90ba | Merge branch 'main' into feature/custom-fields-on-the-booking-page | 2021-06-21 11:35:59 +01:00 |  | 
				
					
						| 
								
								
									 nicolas | ebc42f0c96 | Merge branch 'main' into feature/zoom-integration # Conflicts:
#	lib/calendarClient.ts
#	lib/emails/new-event.ts
#	pages/[user]/book.tsx
#	pages/api/availability/[user].ts
#	pages/api/book/[user].ts
#	pages/integrations/index.tsx | 2021-06-20 16:37:51 +02:00 |  | 
				
					
						| 
								
								
									 Malte Delfs | 543482ca52 | Merge branch 'main' into feature/custom-fields-on-the-booking-page # Conflicts:
#	pages/api/availability/eventtype.ts
#	pages/availability/event/[type].tsx | 2021-06-19 20:47:31 +02:00 |  | 
				
					
						| 
								
								
									 Malte Delfs | 95a99c620e | selected calendars hotfix | 2021-06-18 22:11:13 +02:00 |  | 
				
					
						| 
								
								
									 Malte Delfs | 76b72f64d8 | event type custom input WIP | 2021-06-18 21:58:42 +02:00 |  | 
				
					
						| 
								
								
									 Bailey Pumfleet | 1b1c712c89 | Merge branch 'main' into feature/add-buffer-times-for-appointments | 2021-06-18 17:04:05 +01:00 |  | 
				
					
						| 
								
								
									 Bailey Pumfleet | 90c1ff25bf | Merge branch 'main' into feature/customise-event-names | 2021-06-18 17:00:52 +01: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 | 3366a05c1d | Implemented legacy method to send email even if there is no integration | 2021-06-17 01:04:08 +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 | 68bca9e703 | Implemented a configurable buffer between events | 2021-06-15 18:19:00 +02:00 |  | 
				
					
						| 
								
								
									 Malte Delfs | 4fb0fbfe07 | Made event name customizable | 2021-06-15 17:26:16 +02: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 | 49abf06ce6 | Deleting zoom also works | 2021-06-14 19:00:17 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | c4455b74ba | Rescheduling zoom works | 2021-06-14 18:55:20 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 8e9868db30 | Properly concat results and properly handle zoom meeting uuids | 2021-06-14 18:47:05 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 7ecb7f22e3 | Merge branch 'main' into feature/zoom-integration | 2021-06-14 17:17:09 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 2ba98c5dac | Test setup to try zoom meeting creation | 2021-06-13 15:57:01 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 30f30d7669 | Renamed zoom to zoomvideo | 2021-06-13 14:04:03 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 0bb4678bf7 | Added subtitle to zoom integrations | 2021-06-13 13:59:40 +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 |  | 
				
					
						| 
								
								
									 nicolas | 734d9ad243 | Save whole JSON | 2021-06-11 02:32:07 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | a9a569f876 | Removed scopes variable | 2021-06-11 02:17:22 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | f44c8b6326 | Potentially first working version of token fetching for zoom | 2021-06-11 02:14:36 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 697cae9cc9 | Very rudimentary development version of zoom auth #6 | 2021-06-11 02:13:02 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 65a029acde | Very rudimentary development version of zoom auth #5 | 2021-06-11 02:10:56 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 615e59cde7 | Very rudimentary development version of zoom auth #4 | 2021-06-11 02:08:47 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 46474c9c70 | Very rudimentary development version of zoom auth #3 | 2021-06-11 02:07:02 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | a2f1462f10 | Very rudimentary development version of zoom auth #2 | 2021-06-11 02:03:48 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | b5733716de | Very rudimentary development version of zoom auth | 2021-06-11 01:37:58 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | cb9d749310 | Send email when no integrations are present as well | 2021-06-10 23:18:57 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 3d4222c631 | Merge branch 'main' into feature/cancel-reschedule-links | 2021-06-10 08:33:39 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 01da470664 | Removed whitespaces | 2021-06-10 01:19:46 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 6c92e2fe1b | Implemented short UUID as UID | 2021-06-10 00:51:09 +02:00 |  | 
				
					
						| 
								
								
									 Alex van Andel | 40eb9036f4 | Implements inviting external users to teams | 2021-06-09 21:43:37 +00:00 |  | 
				
					
						| 
								
								
									 Alex van Andel | f24ca5b672 | Fixed incorrect variable & also clears old errors now | 2021-06-09 20:32:02 +00:00 |  | 
				
					
						| 
								
								
									 nicolas | af08c74c8a | Implemented rescheduling and concurrent usage of all integrations | 2021-06-09 21:46:41 +02:00 |  | 
				
					
						| 
								
								
									 Alex van Andel | e8a5357a89 | Restricted usernames to be unique, removes the potential for username conflicts | 2021-06-09 12:26:00 +00:00 |  | 
				
					
						| 
								
								
									 nicolas | 72a07770e8 | Implemented link generation in mails | 2021-06-08 17:24:06 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 27194ef68c | Fixed bug where null email address could occurr in office365 credential key | 2021-06-07 20:21:38 +02:00 |  | 
				
					
						| 
								
								
									 nicolas | 2b84612e5d | Request offline_access in first office365 step | 2021-06-07 19:30:09 +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 |  | 
				
					
						| 
								
								
									 Alex van Andel | 5d3e39ea6e | Better error handling during team member invitation Now tells you if you have already added this member / invite is pending.
Behaviour a little bit more predictable during team editting. | 2021-06-07 15:12:00 +00:00 |  | 
				
					
						| 
								
								
									 nicolas | 1daf9bd3f7 | Use id | 2021-06-07 09:56:15 +02:00 |  |