Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e79453225b 
								
							 
						 
						
							
							
								
								Merge pull request  #471  from KATT/feature/ci-build  
							
							... 
							
							
							
							add `yarn build` in ci 
							
						 
						
							2021-08-17 11:48:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11bbc9a9fd 
								
							 
						 
						
							
							
								
								Merge pull request  #469  from KATT/feature/dependabot  
							
							... 
							
							
							
							add dependabot 
							
						 
						
							2021-08-17 11:47:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								663a9f7bcc 
								
							 
						 
						
							
							
								
								tweak name  
							
							
							
						 
						
							2021-08-17 11:35:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								d59468cbf1 
								
							 
						 
						
							
							
								
								yarn build in ci 
							
							
							
						 
						
							2021-08-17 11:35:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								150bdba134 
								
							 
						 
						
							
							
								
								add linting to ci  
							
							
							
						 
						
							2021-08-17 11:32:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								78e1aebe28 
								
							 
						 
						
							
							
								
								add dependabot  
							
							
							
						 
						
							2021-08-17 11:14:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4b6c13cf9 
								
							 
						 
						
							
							
								
								Merge pull request  #466  from barrydegraaff/patch-1  
							
							... 
							
							
							
							Update README.md 
							
						 
						
							2021-08-17 09:53:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77ada9667a 
								
							 
						 
						
							
							
								
								Merge pull request  #430  from mihaic195/fix/next-auth-issues  
							
							... 
							
							
							
							Fix next-auth issues 
							
						 
						
							2021-08-17 09:52:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Barry de Graaff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								95312a1826 
								
							 
						 
						
							
							
								
								Update README.md  
							
							
							
						 
						
							2021-08-17 10:48:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9ea8fd624 
								
							 
						 
						
							
							
								
								Merge pull request  #445  from mihaic195/fix/feedback-on-event-type-update  
							
							... 
							
							
							
							fix: add success modal on event-type update 
							
						 
						
							2021-08-17 09:41:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f4647874c 
								
							 
						 
						
							
							
								
								Merge pull request  #462  from KATT/feature/eslint-rules  
							
							... 
							
							
							
							disable bad eslint rules 
							
						 
						
							2021-08-17 09:39:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52ca44a3a2 
								
							 
						 
						
							
							
								
								Merge pull request  #464  from emrysal/hotfix/inclusive-exclusive-should-be-other-way  
							
							
							
						 
						
							2021-08-17 06:12:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								3a00ab0d0e 
								
							 
						 
						
							
							
								
								Switched exclusivity, initial bugfix was incorrect  
							
							
							
						 
						
							2021-08-16 22:51:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								bf598a21d4 
								
							 
						 
						
							
							
								
								dark mode for add to calendar buttons  
							
							
							
						 
						
							2021-08-16 23:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer Richelsen 
								
							 
						 
						
							
							
							
							
								
							
							
								6e14a03cc8 
								
							 
						 
						
							
							
								
								reversed tailwind config  
							
							
							
						 
						
							2021-08-16 22:48:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4aadad7920 
								
							 
						 
						
							
							
								
								minor change to README.md  
							
							
							
						 
						
							2021-08-16 19:18:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								b13739bb99 
								
							 
						 
						
							
							
								
								turn on typescript strict mode  
							
							
							
						 
						
							2021-08-16 18:15:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								bd6bd8a38f 
								
							 
						 
						
							
							
								
								disable @typescript-eslint/explicit-function-return-type  
							
							
							
						 
						
							2021-08-16 18:08:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KATT 
								
							 
						 
						
							
							
							
							
								
							
							
								d497323c75 
								
							 
						 
						
							
							
								
								turn off @typescript-eslint/explicit-module-boundary-types  
							
							
							
						 
						
							2021-08-16 18:07:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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