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 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								18715dc5fb
								
							
						 | 
						
							
							
								
								Updated UML Diagram
							
							
							
							
							
						 | 
						
							2018-11-12 17:26:29 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									FunwithaPorpoise
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6f089c951
								
							
						 | 
						
							
							
								
								Merge pull request #16 from ebivibe/DBBranch
							
							
							
							
							
							
							
							Updated DBHelper for Deliverable 3 
							
						 | 
						
							2018-11-11 23:27:18 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								7db152a0a8
								
							
						 | 
						
							
							
								
								Fixed HomeOwner to ServiceProvider
							
							
							
							
							
						 | 
						
							2018-11-11 23:25:07 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								91476b3ddc
								
							
						 | 
						
							
							
								
								Updated DBHelper for Deliverable 3
							
							
							
							
							
						 | 
						
							2018-11-11 22:55:47 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ae4458e98
								
							
						 | 
						
							
							
								
								added latest updates
							
							
							
							
							
						 | 
						
							2018-11-11 18:35:17 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								fbc434c60b
								
							
						 | 
						
							
							
								
								deliverable 3 ui, methods to be filled in
							
							
							
							
							
						 | 
						
							2018-11-11 15:52:55 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2d372d3e5
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2018-11-11 12:15:02 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								8dfa481448
								
							
						 | 
						
							
							
								
								Comment '
							
							
							
							
							
						 | 
						
							2018-11-11 11:59:46 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								20e5eb8d17
								
							
						 | 
						
							
							
								
								Updated UML Diagram
							
							
							
							
							
						 | 
						
							2018-11-11 11:47:23 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								cac2532c5a
								
							
						 | 
						
							
							
								
								Fixed constructor
							
							
							
							
							
						 | 
						
							2018-11-11 11:40:03 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bdca52a6d
								
							
						 | 
						
							
							
								
								Availabilities
							
							
							
							
							
						 | 
						
							2018-11-11 11:37:05 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								b857c93aff
								
							
						 | 
						
							
							
								
								added deliverable 2 submission
							
							
							
							
							
						 | 
						
							2018-11-09 23:40:13 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								fec4574f7c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
							
							
							
							
							
						 | 
						
							2018-11-09 23:32:59 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e3a37d0e8
								
							
						 | 
						
							
							
								
								final ui changes
							
							
							
							
							
						 | 
						
							2018-11-09 23:32:40 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								9a18570b1c
								
							
						 | 
						
							
							
								
								changed uml
							
							
							
							
							
						 | 
						
							2018-11-09 21:42:58 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ad2028dd3
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2018-11-09 17:52:30 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								288cb14f69
								
							
						 | 
						
							
							
								
								removed comma
							
							
							
							
							
						 | 
						
							2018-11-09 17:51:14 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a49bb14d4
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
							
							
							
							
							
						 | 
						
							2018-11-09 17:36:11 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								56c816b10a
								
							
						 | 
						
							
							
								
								made ui look pretty
							
							
							
							
							
						 | 
						
							2018-11-09 17:35:48 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								926ffa89b2
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2018-11-09 11:53:12 -05:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								970c3422f4
								
							
						 | 
						
							
							
								
								comments for project.
							
							
							
							
							
						 | 
						
							2018-11-09 11:48:05 -05:00 | 
						
						
							
							
							
							
								
							
							
						 |