IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								abc98d59f2
								
							
						 | 
						
							
							
								
								updates needed
							
							
							
							
							
						 | 
						
							2018-11-18 14:48:15 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bdd8b5ad6
								
							
						 | 
						
							
							
								
								waiting for dbhelper to finish recycler view
							
							
							
							
							
						 | 
						
							2018-11-18 13:40:28 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b8b0fdfd2
								
							
						 | 
						
							
							
								
								fixed it
							
							
							
							
							
						 | 
						
							2018-11-18 13:39:25 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5c191a781
								
							
						 | 
						
							
							
								
								added rating
							
							
							
							
							
						 | 
						
							2018-11-18 13:38:43 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bb04d516b
								
							
						 | 
						
							
							
								
								added new activities, started find service provider
							
							
							
							
							
						 | 
						
							2018-11-18 13:26:50 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								658a227d7b
								
							
						 | 
						
							
							
								
								updated booking class
							
							
							
							
							
						 | 
						
							2018-11-18 11:57:00 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								16402a2aff
								
							
						 | 
						
							
							
								
								added booking class
							
							
							
							
							
						 | 
						
							2018-11-18 11:48:03 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								7624f2053b
								
							
						 | 
						
							
							
								
								added comments to edit profile and services list
							
							
							
							
							
						 | 
						
							2018-11-17 14:34:36 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								4953db6c55
								
							
						 | 
						
							
							
								
								finished adding description
							
							
							
							
							
						 | 
						
							2018-11-17 14:29:46 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								04829231e2
								
							
						 | 
						
							
							
								
								secondary constructor
							
							
							
							
							
						 | 
						
							2018-11-16 16:06:32 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								2117d58685
								
							
						 | 
						
							
							
								
								what about now
							
							
							
							
							
						 | 
						
							2018-11-16 15:56:09 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1910247c3
								
							
						 | 
						
							
							
								
								what about now
							
							
							
							
							
						 | 
						
							2018-11-16 15:53:03 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								924bb3319e
								
							
						 | 
						
							
							
								
								fixed bad constructor
							
							
							
							
							
						 | 
						
							2018-11-16 15:50:56 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								92c4d8cfd8
								
							
						 | 
						
							
							
								
								Fixed a typo
							
							
							
							
							
						 | 
						
							2018-11-16 15:37:31 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7cf9ba311
								
							
						 | 
						
							
							
								
								Added description field to database and fixed some tests with old ServiceProvider constructor
							
							
							
							
							
						 | 
						
							2018-11-16 15:33:54 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								66d33d4cc4
								
							
						 | 
						
							
							
								
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								76c693e91e
								
							
						 | 
						
							
							
								
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								90a1161f16
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								2742160b60
								
							
						 | 
						
							
							
								
								added general description to front end
							
							
							
							
							
						 | 
						
							2018-11-16 14:37:35 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e781ee225
								
							
						 | 
						
							
							
								
								Added comments
							
							
							
							
							
						 | 
						
							2018-11-16 12:31:19 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2ff9fc82c
								
							
						 | 
						
							
							
								
								Added comments
							
							
							
							
							
						 | 
						
							2018-11-16 12:30:21 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								1a1a9cc6a0
								
							
						 | 
						
							
							
								
								Comments for Availability class.
							
							
							
							
							
						 | 
						
							2018-11-16 12:24:13 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d9e2d565b
								
							
						 | 
						
							
							
								
								commit changes
							
							
							
							
							
						 | 
						
							2018-11-16 12:10:19 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d1c4b24af
								
							
						 | 
						
							
							
								
								changes
							
							
							
							
							
						 | 
						
							2018-11-16 12:08:25 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								3eb2b0dafe
								
							
						 | 
						
							
							
								
								fixed availibilities ui
							
							
							
							
							
						 | 
						
							2018-11-16 12:02:27 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									FunwithaPorpoise
								
							 
						 | 
						
							
							
							
							
								
							
							
								c44539c59d
								
							
						 | 
						
							
							
								
								Merge pull request #17 from ebivibe/DBBranch
							
							
							
							
							
							
							
							Fixed 0 start time bug 
							
						 | 
						
							2018-11-15 15:19:48 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mary Tran
								
							 
						 | 
						
							
							
							
							
								
							
							
								56c57404bd
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f5883bdee
								
							
						 | 
						
							
							
								
								Fixed 0 start time bug
							
							
							
							
							
						 | 
						
							2018-11-15 12:32:37 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e1c5915ca
								
							
						 | 
						
							
							
								
								Added toasts
							
							
							
							
							
						 | 
						
							2018-11-15 11:53:32 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ebda7ab71
								
							
						 | 
						
							
							
								
								working set time.
							
							
							
							
							
						 | 
						
							2018-11-15 10:56:06 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c463906934
								
							
						 | 
						
							
							
								
								comment explaining setTime
							
							
							
							
							
						 | 
						
							2018-11-15 07:33:08 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2b074d518
								
							
						 | 
						
							
							
								
								Service Provider Availabilities
							
							
							
							
							
						 | 
						
							2018-11-15 07:26:46 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anshu Sharma
								
							 
						 | 
						
							
							
							
							
								
							
							
								5eed3f6ee3
								
							
						 | 
						
							
							
								
								check
							
							
							
							
							
						 | 
						
							2018-11-14 21:21:27 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								1634fcfb16
								
							
						 | 
						
							
							
								
								fixed spinner i think?
							
							
							
							
							
						 | 
						
							2018-11-14 20:38:39 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								60f9008151
								
							
						 | 
						
							
							
								
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b72b3162c
								
							
						 | 
						
							
							
								
								fixed small errors
							
							
							
							
							
						 | 
						
							2018-11-14 14:14:22 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								24b16fd8b1
								
							
						 | 
						
							
							
								
								Finished the test files
							
							
							
							
							
						 | 
						
							2018-11-14 13:59:26 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								2eb8555ae5
								
							
						 | 
						
							
							
								
								Added 2 Test Cases
							
							
							
							
							
						 | 
						
							2018-11-14 12:45:59 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								e45e742d71
								
							
						 | 
						
							
							
								
								merging with master
							
							
							
							
							
						 | 
						
							2018-11-14 12:34:44 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								3be59387a4
								
							
						 | 
						
							
							
								
								Updated the branch
							
							
							
							
							
						 | 
						
							2018-11-14 12:26:28 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								3155b66a7e
								
							
						 | 
						
							
							
								
								layout fixes
							
							
							
							
							
						 | 
						
							2018-11-13 22:29:17 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								94b333ded9
								
							
						 | 
						
							
							
								
								fixed availability time formating
							
							
							
							
							
						 | 
						
							2018-11-13 22:20:01 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a7c058c5f
								
							
						 | 
						
							
							
								
								actually fixed license this time
							
							
							
							
							
						 | 
						
							2018-11-13 22:14:51 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								a88a575e7c
								
							
						 | 
						
							
							
								
								fixed sort of
							
							
							
							
							
						 | 
						
							2018-11-13 22:11:19 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								696c4e4e4b
								
							
						 | 
						
							
							
								
								fixed services page
							
							
							
							
							
						 | 
						
							2018-11-13 21:54:44 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Batuhan Berk Başoğlu
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4fd4900ed
								
							
						 | 
						
							
							
								
								Fixed UML
							
							
							
							
							
						 | 
						
							2018-11-13 16:07:24 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								caafe441b9
								
							
						 | 
						
							
							
								
								fixes still needed
							
							
							
							
							
						 | 
						
							2018-11-13 15:17:41 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								a517c63e7a
								
							
						 | 
						
							
							
								
								finished edit profile?
							
							
							
							
							
						 | 
						
							2018-11-13 14:21:45 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf2b4ae004
								
							
						 | 
						
							
							
								
								think i got them all
							
							
							
							
							
						 | 
						
							2018-11-13 14:00:01 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									IvanaE
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3f35ad540
								
							
						 | 
						
							
							
								
								pls work
							
							
							
							
							
						 | 
						
							2018-11-13 13:57:03 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |