IvanaE
|
6e01dd42a3
|
Merge branch 'lBranch'
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
# OlympusServices/.idea/vcs.xml
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
# OlympusServices/app/src/main/res/layout/activity_main.xml
# OlympusServices/app/src/main/res/layout/activity_sign_up.xml
# OlympusServices/build.gradle
|
2018-10-19 19:02:28 -04:00 |
|
Anshu Sharma
|
6d32b64e90
|
Logic
|
2018-10-19 16:45:18 -04:00 |
|
|
|
903a599c88
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-17 17:53:59 -04:00 |
|
|
|
d89ef6c758
|
Changed UML
|
2018-10-17 17:53:33 -04:00 |
|
IvanaE
|
633bfc8fe4
|
gave credit to style repos, removed admin option from sign up drop down
|
2018-10-15 10:36:54 -04:00 |
|
|
|
68d18fb23f
|
Fixed UML Diagram
|
2018-10-14 09:27:59 -04:00 |
|
|
|
12c3091a54
|
Fixed UML Diagram
|
2018-10-14 00:05:55 -04:00 |
|
|
|
3baeb2b679
|
Fixed UML Diagram
|
2018-10-14 00:02:58 -04:00 |
|
IvanaE
|
13de8619d9
|
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
|
cd4c3e1e3f
|
added appointment class and finished ui
|
2018-10-05 12:35:05 -04:00 |
|
IvanaE
|
0677226a71
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-05 11:57:47 -04:00 |
|
IvanaE
|
6edf86c40a
|
created class files for UserType, User, ServiceProvider, Admin, Service
|
2018-10-05 11:57:32 -04:00 |
|
|
|
a8972e06c5
|
fixed some file inconsistencies
|
2018-10-05 11:39:30 -04:00 |
|
IvanaE
|
6bc415d57d
|
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 |
|
