Alex Johansson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aed9757409 
								
							 
						 
						
							
							
								
								fix bad auth commit ( #487 )  
							
							
							
						 
						
							2021-08-18 12:15:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Johansson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a0a0ec86f0 
								
							 
						 
						
							
							
								
								add type-safe getSession() ( #486 )  
							
							... 
							
							
							
							* fix types for auth
* implement safer to use `getSession` 
							
						 
						
							2021-08-18 11:52:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								3a00ab0d0e 
								
							 
						 
						
							
							
								
								Switched exclusivity, initial bugfix was incorrect  
							
							
							
						 
						
							2021-08-16 22:51:52 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								83bef7d95e 
								
							 
						 
						
							
							
								
								Merge pull request  #448  from femyeda/team-pages  
							
							... 
							
							
							
							Team pages 
							
						 
						
							2021-08-15 18:44:42 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kanji Keraliya 
								
							 
						 
						
							
							
							
							
								
							
							
								4c48410e2d 
								
							 
						 
						
							
							
								
								Fixed: Office 365 integration redirection url issue  
							
							
							
						 
						
							2021-08-14 11:55:43 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									femyeda 
								
							 
						 
						
							
							
							
							
								
							
							
								216a7c0c48 
								
							 
						 
						
							
							
								
								prevent duplicate team names  
							
							
							
						 
						
							2021-08-13 14:50:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da98a1ff1d 
								
							 
						 
						
							
							
								
								Merge pull request  #413  from emrysal/bugfix/fix-zoom-calendar-conflict  
							
							
							
						 
						
							2021-08-13 09:08:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								5a5e61739b 
								
							 
						 
						
							
							
								
								Removed faulty check  
							
							
							
						 
						
							2021-08-08 21:41:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								560bd19472 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-08-08 21:21:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								8bc209f6d0 
								
							 
						 
						
							
							
								
								Attempts to fix conflict with zoom  
							
							
							
						 
						
							2021-08-04 21:04:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								72b62cd49a 
								
							 
						 
						
							
							
								
								Removed selectedEventType + fixed missing booking.eventTypeId  
							
							
							
						 
						
							2021-08-04 20:03:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Peer_Rich 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6977b74f35 
								
							 
						 
						
							
							
								
								Merge pull request  #411  from alishaz-polymath/main  
							
							... 
							
							
							
							Added 'Add Guest' button at the confirm booking step 
							
						 
						
							2021-08-04 20:17:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syed Ali Shahbaz 
								
							 
						 
						
							
							
							
							
								
							
							
								00069fa9a7 
								
							 
						 
						
							
							
								
								Added -Add guest- button at confirm booking step, and minor code improvement  
							
							
							
						 
						
							2021-08-04 16:09:43 +05:30 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								78de56b7f5 
								
							 
						 
						
							
							
								
								Missing dayjs().isBetween plugin + format Z explicitly  
							
							
							
						 
						
							2021-08-03 10:14:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								bd28636af5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-07-28 22:01:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								65fd733751 
								
							 
						 
						
							
							
								
								Use optional udi  
							
							
							
						 
						
							2021-07-25 17:08:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								4fb8e8285e 
								
							 
						 
						
							
							
								
								Added location to event  
							
							
							
						 
						
							2021-07-25 16:29:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								df161d5498 
								
							 
						 
						
							
							
								
								Added location to bookings table  
							
							
							
						 
						
							2021-07-25 14:37:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								a97862d4b8 
								
							 
						 
						
							
							
								
								Process event location in EventManager  
							
							
							
						 
						
							2021-07-25 14:19:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								86e2add30f 
								
							 
						 
						
							
							
								
								Resolved conflicts; included reference creation into EventManager; use EventManager everywhere  
							
							
							
						 
						
							2021-07-24 22:24:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								9234f74bec 
								
							 
						 
						
							
							
								
								Added accompanying frontend  
							
							
							
						 
						
							2021-07-23 20:19:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02dd0eb8e2 
								
							 
						 
						
							
							
								
								Merge pull request  #371  from Malte-D/feature/opt-in-booking  
							
							... 
							
							
							
							Feature/opt in booking 
							
						 
						
							2021-07-22 11:30:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								e0abbbb2f1 
								
							 
						 
						
							
							
								
								Fixed linting errors  
							
							
							
						 
						
							2021-07-20 20:18:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								7aff32fb50 
								
							 
						 
						
							
							
								
								Only send single mail when booking zoom  
							
							
							
						 
						
							2021-07-20 20:07:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								7098e75841 
								
							 
						 
						
							
							
								
								Fixes 404 issue with slug when trailing whitespaces exist  
							
							
							
						 
						
							2021-07-20 13:27:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								0c975cdcbc 
								
							 
						 
						
							
							
								
								fixed codacy issues  
							
							
							
						 
						
							2021-07-18 21:22:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								f5516ed427 
								
							 
						 
						
							
							
								
								added reminder emails for opt-in bookings  
							
							
							
						 
						
							2021-07-18 21:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Delfs 
								
							 
						 
						
							
							
							
							
								
							
							
								a2bf242c9e 
								
							 
						 
						
							
							
								
								opt in booking  
							
							
							
						 
						
							2021-07-18 20:28:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								81e1287693 
								
							 
						 
						
							
							
								
								Fixed cancellation  
							
							
							
						 
						
							2021-07-18 16:03:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								b4ed8ae87e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into bugfix/unify-email-sending  
							
							
							
						 
						
							2021-07-18 15:12:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								b146b80778 
								
							 
						 
						
							
							
								
								Fixed signature  
							
							
							
						 
						
							2021-07-15 23:34:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45689059c7 
								
							 
						 
						
							
							
								
								Feat/cal 95/date range on event types ( #353 )  
							
							... 
							
							
							
							* add edit links to events on dashboard
* fit elements on screen for mobile
* initialize components for consistent text styles
* add more fine grained width/height settings
* add higher level setting for when an event is available
- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available
* fix issue where periodDates are null
* return minimal required data, handle date parsing
* [ui] limit booking days based on user period settings
* api: validate user period settings
* [db] migration for event type period settings 
							
						 
						
							2021-07-15 09:10:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								daecc1e0e4 
								
							 
						 
						
							
							
								
								Created EventManager in order to unify event CRUD logic  
							
							
							
						 
						
							2021-07-15 03:19:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								4d7427ad91 
								
							 
						 
						
							
							
								
								Fixes some linting + codacy issues  
							
							
							
						 
						
							2021-07-11 19:43:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex van Andel 
								
							 
						 
						
							
							
							
							
								
							
							
								5206fb4f88 
								
							 
						 
						
							
							
								
								Implemented theme through user preferences  
							
							
							
						 
						
							2021-07-09 23:13:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36b258f4b7 
								
							 
						 
						
							
							
								
								safely check user availability ( #352 )  
							
							
							
						 
						
							2021-07-09 10:55:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5c4a9c32d1 
								
							 
						 
						
							
							
								
								Add application logger ( #332 )  
							
							... 
							
							
							
							* add application logger
* use logger 
							
						 
						
							2021-07-09 10:49:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Femi Odugbesan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f73997e72 
								
							 
						 
						
							
							
								
								safely check isAvailable ( #331 )  
							
							... 
							
							
							
							fix issue where checking availability throws an error 
							
						 
						
							2021-07-07 11:53:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								3c09837104 
								
							 
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							2021-07-07 12:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad00e5fc0c 
								
							 
						 
						
							
							
								
								Merge pull request  #333  from mihaic195/fix/teams-create-error-and-unauthenticated-request  
							
							... 
							
							
							
							Team API error and page 
							
						 
						
							2021-07-07 10:56:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bailey Pumfleet 
								
							 
						 
						
							
							
							
							
								
							
							
								43f899582f 
								
							 
						 
						
							
							
								
								Fix issue where user ID is not fetched  
							
							
							
						 
						
							2021-07-06 22:09:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e315b272f5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request  
							
							
							
						 
						
							2021-07-05 10:18:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mihaic195 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6463b3ba37 
								
							 
						 
						
							
							
								
								fix codacy suggestions  
							
							
							
						 
						
							2021-07-01 12:47:12 +03:00