IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								d15af93180
								
							
						 | 
						
							
							
								
								added new activities, started find service provider
							
							
							
							
							
						 | 
						
							2018-11-18 13:26:50 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								af48d1b905
								
							
						 | 
						
							
							
								
								updated booking class
							
							
							
							
							
						 | 
						
							2018-11-18 11:57:00 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f7d8feec3
								
							
						 | 
						
							
							
								
								added booking class
							
							
							
							
							
						 | 
						
							2018-11-18 11:48:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ba91f5cde
								
							
						 | 
						
							
							
								
								added comments to edit profile and services list
							
							
							
							
							
						 | 
						
							2018-11-17 14:34:36 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								18216adfae
								
							
						 | 
						
							
							
								
								finished adding description
							
							
							
							
							
						 | 
						
							2018-11-17 14:29:46 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d33269b15
								
							
						 | 
						
							
							
								
								secondary constructor
							
							
							
							
							
						 | 
						
							2018-11-16 16:06:32 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								60c1329bcd
								
							
						 | 
						
							
							
								
								what about now
							
							
							
							
							
						 | 
						
							2018-11-16 15:56:09 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								04c895262e
								
							
						 | 
						
							
							
								
								what about now
							
							
							
							
							
						 | 
						
							2018-11-16 15:53:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb06782c04
								
							
						 | 
						
							
							
								
								fixed bad constructor
							
							
							
							
							
						 | 
						
							2018-11-16 15:50:56 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								d83ae6bb69
								
							
						 | 
						
							
							
								
								Fixed a typo
							
							
							
							
							
						 | 
						
							2018-11-16 15:37:31 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ddcb21f9c
								
							
						 | 
						
							
							
								
								Added description field to database and fixed some tests with old ServiceProvider constructor
							
							
							
							
							
						 | 
						
							2018-11-16 15:33:54 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								05affa6903
								
							
						 | 
						
							
							
								
								Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed
							
							
							
							
							
						 | 
						
							2018-11-16 14:48:27 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								17b07d2d2c
								
							
						 | 
						
							
							
								
								Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed
							
							
							
							
							
						 | 
						
							2018-11-16 14:48:02 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e08f9464d1
								
							
						 | 
						
							
							
								
								Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed
							
							
							
							
							
						 | 
						
							2018-11-16 14:47:26 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								daf7e4133a
								
							
						 | 
						
							
							
								
								added general description to front end
							
							
							
							
							
						 | 
						
							2018-11-16 14:37:35 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								617b75b997
								
							
						 | 
						
							
							
								
								Added comments
							
							
							
							
							
						 | 
						
							2018-11-16 12:31:19 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								22d678be9e
								
							
						 | 
						
							
							
								
								Added comments
							
							
							
							
							
						 | 
						
							2018-11-16 12:30:21 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7a2efd5ef
								
							
						 | 
						
							
							
								
								Comments for Availability class.
							
							
							
							
							
						 | 
						
							2018-11-16 12:24:13 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d81799f038
								
							
						 | 
						
							
							
								
								commit changes
							
							
							
							
							
						 | 
						
							2018-11-16 12:10:19 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								19d9956392
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2018-11-16 12:08:25 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b1ef72f49
								
							
						 | 
						
							
							
								
								fixed availibilities ui
							
							
							
							
							
						 | 
						
							2018-11-16 12:02:27 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									FunwithaPorpoise
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c2c67be68
								
							
						 | 
						
							
							
								
								Merge pull request #17 from ebivibe/DBBranch
							
							
							
							
							
							
							
							Fixed 0 start time bug 
							
						 | 
						
							2018-11-15 15:19:48 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								858907d2de
								
							
						 | 
						
							
							
								
								Added a few tests and made deleting a Provider delete all relevant rows in all tables
							
							
							
							
							
						 | 
						
							2018-11-15 15:17:07 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a2944adce
								
							
						 | 
						
							
							
								
								Fixed 0 start time bug
							
							
							
							
							
						 | 
						
							2018-11-15 12:32:37 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f640904da7
								
							
						 | 
						
							
							
								
								Added toasts
							
							
							
							
							
						 | 
						
							2018-11-15 11:53:32 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								08a88bd2ac
								
							
						 | 
						
							
							
								
								working set time.
							
							
							
							
							
						 | 
						
							2018-11-15 10:56:06 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0719293f9
								
							
						 | 
						
							
							
								
								comment explaining setTime
							
							
							
							
							
						 | 
						
							2018-11-15 07:33:08 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6276160f94
								
							
						 | 
						
							
							
								
								Service Provider Availabilities
							
							
							
							
							
						 | 
						
							2018-11-15 07:26:46 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								57fdeae53a
								
							
						 | 
						
							
							
								
								check
							
							
							
							
							
						 | 
						
							2018-11-14 21:21:27 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7cc459862
								
							
						 | 
						
							
							
								
								fixed spinner i think?
							
							
							
							
							
						 | 
						
							2018-11-14 20:38:39 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f88a7bc71
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
							
							
							
							
							
							
							
							# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser 
							
						 | 
						
							2018-11-14 14:15:06 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac5b0fc972
								
							
						 | 
						
							
							
								
								fixed small errors
							
							
							
							
							
						 | 
						
							2018-11-14 14:14:22 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								cc2e0566df
								
							
						 | 
						
							
							
								
								Finished the test files
							
							
							
							
							
						 | 
						
							2018-11-14 13:59:26 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								fd9888fcdc
								
							
						 | 
						
							
							
								
								Added 2 Test Cases
							
							
							
							
							
						 | 
						
							2018-11-14 12:45:59 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6495b19d9e
								
							
						 | 
						
							
							
								
								merging with master
							
							
							
							
							
						 | 
						
							2018-11-14 12:34:44 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3470b334ca
								
							
						 | 
						
							
							
								
								Updated the branch
							
							
							
							
							
						 | 
						
							2018-11-14 12:26:28 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								1cc89a1cb7
								
							
						 | 
						
							
							
								
								layout fixes
							
							
							
							
							
						 | 
						
							2018-11-13 22:29:17 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								b250363f49
								
							
						 | 
						
							
							
								
								fixed availability time formating
							
							
							
							
							
						 | 
						
							2018-11-13 22:20:01 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								8408aed8f6
								
							
						 | 
						
							
							
								
								actually fixed license this time
							
							
							
							
							
						 | 
						
							2018-11-13 22:14:51 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								65c906b1f9
								
							
						 | 
						
							
							
								
								fixed sort of
							
							
							
							
							
						 | 
						
							2018-11-13 22:11:19 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								06310f1b90
								
							
						 | 
						
							
							
								
								fixed services page
							
							
							
							
							
						 | 
						
							2018-11-13 21:54:44 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e96f837b57
								
							
						 | 
						
							
							
								
								Deleted useless docx file
							
							
							
							
							
						 | 
						
							2018-11-13 16:10:57 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								725bf4dbd4
								
							
						 | 
						
							
							
								
								Fixed UML
							
							
							
							
							
						 | 
						
							2018-11-13 16:07:24 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								8750d55198
								
							
						 | 
						
							
							
								
								fixes still needed
							
							
							
							
							
						 | 
						
							2018-11-13 15:17:41 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								995142d117
								
							
						 | 
						
							
							
								
								finished edit profile?
							
							
							
							
							
						 | 
						
							2018-11-13 14:21:45 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3550b9ea8
								
							
						 | 
						
							
							
								
								think i got them all
							
							
							
							
							
						 | 
						
							2018-11-13 14:00:01 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								7594bc45fc
								
							
						 | 
						
							
							
								
								pls work
							
							
							
							
							
						 | 
						
							2018-11-13 13:57:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ce3d9e512
								
							
						 | 
						
							
							
								
								one more go
							
							
							
							
							
						 | 
						
							2018-11-13 13:53:55 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								a422c6fc3d
								
							
						 | 
						
							
							
								
								how about now?
							
							
							
							
							
						 | 
						
							2018-11-13 13:49:26 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e555f0b41
								
							
						 | 
						
							
							
								
								broken code will be fixed soon :(
							
							
							
							
							
						 | 
						
							2018-11-13 13:40:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 |