Commit graph

15 commits

Author SHA1 Message Date
Batuhan Berk Başoğlu
9cd04e06da Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-17 17:53:59 -04:00
Batuhan Berk Başoğlu
5599bd9179 Changed UML 2018-10-17 17:53:33 -04:00
IvanaE
6f9590413f gave credit to style repos, removed admin option from sign up drop down 2018-10-15 10:36:54 -04:00
Batuhan Berk Başoğlu
ab84abd042 Fixed UML Diagram 2018-10-14 09:27:59 -04:00
Batuhan Berk Başoğlu
0d9cf73143 Fixed UML Diagram 2018-10-14 00:05:55 -04:00
Batuhan Berk Başoğlu
7cde8be55a Fixed UML Diagram 2018-10-14 00:02:58 -04:00
IvanaE
296aaf05e3 fixed merge conflict, when you pull check the right dependency is in your build.gradle file 2018-10-10 13:44:55 -04:00
IvanaE
0b36bb32e3 added appointment class and finished ui 2018-10-05 12:35:05 -04:00
IvanaE
f299770923 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-05 11:57:47 -04:00
IvanaE
6b1ff038c8 created class files for UserType, User, ServiceProvider, Admin, Service 2018-10-05 11:57:32 -04:00
Batuhan Berk Başoğlu
ac7e8aec0a fixed some file inconsistencies 2018-10-05 11:39:30 -04:00
IvanaE
9cd853df11 fixed text colour 2018-10-04 14:14:59 -04:00
IvanaE
036c03f07e added all pages, using premade components 2018-10-04 13:23:53 -04:00
IvanaE
5a97ad2ec8 added sign up page, still working on drop down menu 2018-09-28 18:09:05 -04:00
IvanaE
5663255788 Added android project 2018-09-28 15:39:43 -04:00