Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec9fefefec 
								
							 
						 
						
							
							
								
								Merge pull request  #459  from femyeda/caldav-connection-issues  
							
							
							
						 
						
							2021-08-16 16:39:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								49e7cbf803 
								
							 
						 
						
							
							
								
								fix issue where user could not connect to caldav  
							
							... 
							
							
							
							Uses base caldav adapter to ensure connectivity
rethrows all errors on CalDavCalendarAdapter 
							
						 
						
							2021-08-16 09:34:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f35dfa5f0 
								
							 
						 
						
							
							
								
								Merge pull request  #393  from emrysal/feature/fix-railway  
							
							... 
							
							
							
							Added project.toml to force yarn over npm when using Railway 
							
						 
						
							2021-08-16 13:41:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dcb619af1f 
								
							 
						 
						
							
							
								
								Merge pull request  #434  from joshsny/bugfix/cancel  
							
							... 
							
							
							
							Fix 500 error when trying to cancel a booking that was already cancelled. 
							
						 
						
							2021-08-16 13:31:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								06dce130b2 
								
							 
						 
						
							
							
								
								Merge pull request  #450  from emrysal/bugfix/custom-inputs  
							
							
							
						 
						
							2021-08-16 10:35:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ceacf02383 
								
							 
						 
						
							
							
								
								Merge pull request  #449  from kanji-keraliya/office-365-integration-domain  
							
							... 
							
							
							
							Fixed: Office 365 integration redirection URL issue 
							
						 
						
							2021-08-16 10:23:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d725a9573 
								
							 
						 
						
							
							
								
								Merge pull request  #412  from emrysal/bugfix/eventType-merge-artifacts  
							
							... 
							
							
							
							Removed selectedEventType + fixed missing booking.eventTypeId 
							
						 
						
							2021-08-16 10:22:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85879e4de1 
								
							 
						 
						
							
							
								
								added some shields.io badges  
							
							
							
						 
						
							2021-08-15 22:36:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83bef7d95e 
								
							 
						 
						
							
							
								
								Merge pull request  #448  from femyeda/team-pages  
							
							... 
							
							
							
							Team pages 
							
						 
						
							2021-08-15 18:44:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3074b67147 
								
							 
						 
						
							
							
								
								Merge pull request  #452  from alishaz-polymath/main  
							
							... 
							
							
							
							Added Slider Component and hooked it up with the Image Uploader component 
							
						 
						
							2021-08-15 18:41:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								b1c2db91e7 
								
							 
						 
						
							
							
								
								Merge branch 'main' of github.com:calendso/calendso  
							
							
							
						 
						
							2021-08-15 18:38:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								73bec6287d 
								
							 
						 
						
							
							
								
								replaced caldav icon  
							
							
							
						 
						
							2021-08-15 18:37:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65d6791a36 
								
							 
						 
						
							
							
								
								url input has incorrect label props ( #455 )  
							
							
							
						 
						
							2021-08-15 09:32:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce63c55051 
								
							 
						 
						
							
							
								
								Merge pull request  #454  from femyeda/issues-w-caldav  
							
							
							
						 
						
							2021-08-15 16:26:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								19ef588fa5 
								
							 
						 
						
							
							
								
								fix issue where client side vali  
							
							... 
							
							
							
							dation not happening
show error message from server 
							
						 
						
							2021-08-15 09:22:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								420839bcf5 
								
							 
						 
						
							
							
								
								fix issue where user cant cancel caldav dialog  
							
							
							
						 
						
							2021-08-15 08:49:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								f07d727a3f 
								
							 
						 
						
							
							
								
								Cleaned up code and removed debug remnants  
							
							
							
						 
						
							2021-08-15 17:05:30 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								81c16fea23 
								
							 
						 
						
							
							
								
								fixed min-value-setter issue  
							
							
							
						 
						
							2021-08-15 16:57:06 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								c3959e3cd4 
								
							 
						 
						
							
							
								
								added design elements to the slider  
							
							
							
						 
						
							2021-08-15 16:57:06 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								2fb510723c 
								
							 
						 
						
							
							
								
								radix-ui-slider added  
							
							
							
						 
						
							2021-08-15 16:57:06 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								a15d05be86 
								
							 
						 
						
							
							
								
								tried fixing the layout of new CalDav integration  
							
							
							
						 
						
							2021-08-15 13:10:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3fbba351ab 
								
							 
						 
						
							
							
								
								Merge pull request  #441  from alishaz-polymath/main  
							
							... 
							
							
							
							added image-uploader component and refactored profile settings page 
							
						 
						
							2021-08-15 12:50:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								610ea6c9ef 
								
							 
						 
						
							
							
								
								Merge branch 'main' into main  
							
							
							
						 
						
							2021-08-15 12:48:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65366b7c5b 
								
							 
						 
						
							
							
								
								cal-101-caldav-integration ( #419 )  
							
							... 
							
							
							
							* add generic calendar icon for caldav
* module for symmetric encrypt/decrypt
* caldav integration
* use Radix dialog
* Move caldav components to /caldav
* remove duplicate cancel button, unused function
* ensure app can connect to caldav server before adding
* fix calendar clients can possibly return null
* fix: add caldav dialog does not close when submitted
* safely attempt all caldav operations
* clarify variable name, fix typo
* use common helper for stripping html
* remove usage of request lib until "completed"
* add types and usage comments to crypto lib
* add encryption key to example env file 
							
						 
						
							2021-08-14 20:53:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								9a8ee10555 
								
							 
						 
						
							
							
								
								Added custom migration to prevent data loss  
							
							
							
						 
						
							2021-08-14 18:12:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								252a329f09 
								
							 
						 
						
							
							
								
								Fixed issues relating to custom-inputs  
							
							... 
							
							
							
							* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum 
							
						 
						
							2021-08-14 17:03:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								3a5e7dd61c 
								
							 
						 
						
							
							
								
								Delete old redundant page  
							
							
							
						 
						
							2021-08-14 16:43:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								03cfd4ba8b 
								
							 
						 
						
							
							
								
								Detect conflicts when the time is the same as startTime  
							
							
							
						 
						
							2021-08-14 15:01:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								92d3f08f70 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/eventType-merge-artifacts  
							
							
							
						 
						
							2021-08-14 14:56:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								21c709ee46 
								
							 
						 
						
							
							
								
								fixed booking layout for tablet  
							
							
							
						 
						
							2021-08-14 14:26:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								ea4ac26992 
								
							 
						 
						
							
							
								
								Merge branch 'main' of github.com:calendso/calendso  
							
							
							
						 
						
							2021-08-14 14:20:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								8e2e798572 
								
							 
						 
						
							
							
								
								wip  
							
							
							
						 
						
							2021-08-14 14:19:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kanji Keraliya 
								
							 
						 
						
							
							
							
							
								
							
							
								4c48410e2d 
								
							 
						 
						
							
							
								
								Fixed: Office 365 integration redirection url issue  
							
							
							
						 
						
							2021-08-14 11:55:43 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								6b7fbe9ecf 
								
							 
						 
						
							
							
								
								removed debug remnants  
							
							
							
						 
						
							2021-08-14 09:20:11 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								216a7c0c48 
								
							 
						 
						
							
							
								
								prevent duplicate team names  
							
							
							
						 
						
							2021-08-13 14:50:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								60a4b8b29e 
								
							 
						 
						
							
							
								
								add page for teams  
							
							
							
						 
						
							2021-08-13 14:46:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								917431f4e8 
								
							 
						 
						
							
							
								
								db: add slug to team schema  
							
							
							
						 
						
							2021-08-13 14:44:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								b46cf39ef2 
								
							 
						 
						
							
							
								
								use classnames, remove css  
							
							
							
						 
						
							2021-08-13 13:18:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5193b723a4 
								
							 
						 
						
							
							
								
								fix: add success modal on event-type update  
							
							
							
						 
						
							2021-08-13 12:48:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da98a1ff1d 
								
							 
						 
						
							
							
								
								Merge pull request  #413  from emrysal/bugfix/fix-zoom-calendar-conflict  
							
							
							
						 
						
							2021-08-13 09:08:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								7ff55b29e0 
								
							 
						 
						
							
							
								
								minor changes to availability headline in booking page  
							
							
							
						 
						
							2021-08-12 19:10:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								99e003153e 
								
							 
						 
						
							
							
								
								moved og:image outside of isReady scope so it renders on the server  
							
							
							
						 
						
							2021-08-12 19:05:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								d682804c5f 
								
							 
						 
						
							
							
								
								wip  
							
							
							
						 
						
							2021-08-12 16:35:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								1dc6ae1d26 
								
							 
						 
						
							
							
								
								added border to date picker days on mobile  
							
							
							
						 
						
							2021-08-12 16:29:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								7b2b75c25c 
								
							 
						 
						
							
							
								
								wip  
							
							
							
						 
						
							2021-08-12 15:55:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								c322690cf5 
								
							 
						 
						
							
							
								
								applied new styles to available times  
							
							
							
						 
						
							2021-08-12 15:54:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								655b2b18e8 
								
							 
						 
						
							
							
								
								another booking page design revision  
							
							
							
						 
						
							2021-08-12 15:51:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								867e582342 
								
							 
						 
						
							
							
								
								code improvement and accept image only for image uploader input  
							
							
							
						 
						
							2021-08-12 16:08:01 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									joshsny 
								
							 
						 
						
							
							
							
							
								
							
							
								bcb2835648 
								
							 
						 
						
							
							
								
								fixed bug when eventType does not exist for booking  
							
							
							
						 
						
							2021-08-12 12:23:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joshua Snyder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6415b561b7 
								
							 
						 
						
							
							
								
								Update pages/availability/troubleshoot.tsx  
							
							... 
							
							
							
							Co-authored-by: Nico <spam@nicolasjessen.de> 
							
						 
						
							2021-08-12 06:54:01 +02:00