Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								a463fded8f
								
							
						 | 
						
							
							
								
								Added <AvailableTimes /> and <TimeOptions /> components
							
							
							
							
							
						 | 
						
							2021-06-20 14:19:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer Richelsen
								
							 
						 | 
						
							
							
							
							
								
							
							
								39fde7874d
								
							
						 | 
						
							
							
								
								upgraded tailwindcss to support jit https://tailwindcss.com/docs/just-in-time-mode, moved css components into global.css to support jit
							
							
							
							
							
						 | 
						
							2021-06-20 10:57:33 +01: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								01eacedde8
								
							
						 | 
						
							
							
								
								Timezone should never be  unless it has no state yet, so used that to simplify TimeOptions
							
							
							
							
							
						 | 
						
							2021-06-20 00:08:48 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								50d325d20a
								
							
						 | 
						
							
							
								
								added schema for EventTypeCustomInput
							
							
							
							
							
						 | 
						
							2021-06-19 20:55:40 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6d7ec7fa66
								
							
						 | 
						
							
							
								
								Merge pull request #289 from femyeda/hotfix/500-on-type-page
							
							
							
							
							
							
							
							fix: eventType not defined on [user]/[type] 
							
						 | 
						
							2021-06-19 16:19:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									femyeda
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad0b561cca
								
							
						 | 
						
							
							
								
								fix: eventType not defined on [user]/[type]
							
							
							
							
							
						 | 
						
							2021-06-19 10:17:23 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer_Rich
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fbc504f670
								
							
						 | 
						
							
							
								
								Merge pull request #288 from femyeda/revert-286-bugfix/cancellation-eventtype-null
							
							
							
							
							
						 | 
						
							2021-06-19 15:55:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Femi Odugbesan
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								de4c8f75e0
								
							
						 | 
						
							
							
								
								Revert "Fixed cancellation bug: "cannot read property 'length' of null""
							
							
							
							
							
						 | 
						
							2021-06-19 09:14:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								11fc0f0d2a
								
							
						 | 
						
							
							
								
								Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
							
							
							
							
							
						 | 
						
							2021-06-19 09:24:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								11ba59be9c
								
							
						 | 
						
							
							
								
								Fixes #281
							
							
							
							
							
						 | 
						
							2021-06-19 03:40:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								440bee0a5f
								
							
						 | 
						
							
							
								
								Merge pull request #285 from emrysal/bugfix/throw-404-when-eventType-missing
							
							
							
							
							
						 | 
						
							2021-06-18 23:35:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc1b3fa7dd
								
							
						 | 
						
							
							
								
								Return 404 when requesting event url that does not exist
							
							
							
							
							
						 | 
						
							2021-06-18 20:41:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								aed5af0f5e
								
							
						 | 
						
							
							
								
								Merge pull request #284 from Malte-D/hotfix/selected-calendars
							
							
							
							
							
						 | 
						
							2021-06-18 21:27:10 +01: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								2441f47c10
								
							
						 | 
						
							
							
								
								Fix layout issue with event types
							
							
							
							
							
						 | 
						
							2021-06-18 17:21:39 +01: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
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f0a80ac87
								
							
						 | 
						
							
							
								
								Merge pull request #275 from Malte-D/feature/add-buffer-times-for-appointments
							
							
							
							
							
							
							
							Implemented a configurable buffer between events 
							
						 | 
						
							2021-06-18 17:04:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1b1c712c89
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/add-buffer-times-for-appointments
							
							
							
							
							
						 | 
						
							2021-06-18 17:04:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ecc36a5a0c
								
							
						 | 
						
							
							
								
								Merge pull request #273 from emrysal/bugfix/add-email-verification-to-migrations
							
							
							
							
							
							
							
							Added migrations for adding external users 
							
						 | 
						
							2021-06-18 17:01:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								159a7e20a5
								
							
						 | 
						
							
							
								
								Merge pull request #272 from Malte-D/feature/customise-event-names
							
							
							
							
							
							
							
							Feature/customise event names 
							
						 | 
						
							2021-06-18 17:01:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								90c1ff25bf
								
							
						 | 
						
							
							
								
								Merge branch 'main' into feature/customise-event-names
							
							
							
							
							
						 | 
						
							2021-06-18 17:00:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bailey Pumfleet
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2960463f77
								
							
						 | 
						
							
							
								
								Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
							
							
							
							
							
							
							
							Feature: select calendars to check for availability 
							
						 | 
						
							2021-06-18 17:00:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2466440f9
								
							
						 | 
						
							
							
								
								removed debug logging
							
							
							
							
							
						 | 
						
							2021-06-18 14:03:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Malte Delfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								50bc6b480e
								
							
						 | 
						
							
							
								
								minor change
							
							
							
							
							
						 | 
						
							2021-06-18 14:00:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer_Rich
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8bf556c742
								
							
						 | 
						
							
							
								
								Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice
							
							
							
							
							
							
							
							Updated useEffect so it only fires once (added []) 
							
						 | 
						
							2021-06-18 11:35:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer_Rich
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								066032a219
								
							
						 | 
						
							
							
								
								Merge pull request #276 from calendso/manage-subscription
							
							
							
							
							
						 | 
						
							2021-06-18 09:31:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								46bff28f0d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/feature/zoom-integration' into feature/zoom-integration
							
							
							
							
							
						 | 
						
							2021-06-18 02:48:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								c662c97d14
								
							
						 | 
						
							
							
								
								Refactored EventOwner to EventOrganizer
							
							
							
							
							
						 | 
						
							2021-06-18 02:44:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								7584b77811
								
							
						 | 
						
							
							
								
								Updated useEffect so it only fires once (added [])
							
							
							
							
							
						 | 
						
							2021-06-17 19:29:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer_Rich
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b3c5752d67
								
							
						 | 
						
							
							
								
								updated integration description
							
							
							
							
							
						 | 
						
							2021-06-17 17:06:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rrrricky
								
							 
						 | 
						
							
							
							
							
								
							
							
								46698e4a40
								
							
						 | 
						
							
							
								
								fix: Use proper url parameter for profile img placeholder
							
							
							
							
							
						 | 
						
							2021-06-17 16:47:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e9ffdd656
								
							
						 | 
						
							
							
								
								Added section for zoom app generation in README.md
							
							
							
							
							
						 | 
						
							2021-06-17 10:59:59 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								3366a05c1d
								
							
						 | 
						
							
							
								
								Implemented legacy method to send email even if there is no integration
							
							
							
							
							
						 | 
						
							2021-06-17 01:04:08 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3dbc52676
								
							
						 | 
						
							
							
								
								Cleaned up loading the availability schedule
							
							
							
							
							
						 | 
						
							2021-06-16 22:50:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex van Andel
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d5186f1e3
								
							
						 | 
						
							
							
								
								Functionality works, only thing left is a bit of cleaning up and all done
							
							
							
							
							
						 | 
						
							2021-06-16 22:27:27 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Peer Richelsen
								
							 
						 | 
						
							
							
							
							
								
							
							
								1de9ccff3a
								
							
						 | 
						
							
							
								
								minor changes
							
							
							
							
							
						 | 
						
							2021-06-16 14:04:04 +01:00 | 
						
						
							
							
							
								
							
							
						 |