Commit graph

22 commits

Author SHA1 Message Date
Anshu Sharma
72bf00563c fixing branch 2018-11-07 12:29:30 -05:00
Anshu Sharma
5eae198bbf resolve conflicts 2018-11-07 12:17:18 -05:00
Anshu Sharma
d4f1433f91 whatever 2018-11-07 11:26:51 -05:00
Anshu Sharma
8be4ccbbd7 Logic 2018-10-19 16:45:18 -04:00
Mary Tran
555932b877 Changed some unit test usernames to randomized string 2018-10-08 18:16:08 -04:00
Mary Tran
a80c6d37dc Added docs and ability to get a list of all users from database 2018-10-08 18:00:21 -04:00
Mary Tran
5a382baab4 Running unit tests with Robolectric instead of starting up emulator every time 2018-10-08 16:25:15 -04:00
Mary Tran
8ecd089fe3 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes 2018-10-08 11:48:58 -04:00
IvanaE
aa102421ef another text fix 2018-10-05 12:45:50 -04:00
IvanaE
e1b947ef43 fixed text 2018-10-05 12:45:07 -04:00
IvanaE
0499d81093 added borders 2018-10-05 12:38:13 -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
bcfa204f44 fixed some file inconsistencies 2018-10-05 11:40:22 -04:00
Batuhan Berk Başoğlu
ac7e8aec0a fixed some file inconsistencies 2018-10-05 11:39:30 -04:00
Batuhan Berk Başoğlu
a9746fb215 Made the UML Class Diagram 2018-10-05 11:23:36 -04:00
Batuhan Berk Başoğlu
65bc8b2109 Made the UML Class Diagram 2018-10-05 11:20:01 -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