FunwithaPorpoise
|
04362b99c0
|
Merge pull request #12 from ebivibe/DBBranch
Db branch
|
2018-10-22 14:25:17 -04:00 |
|
Mary Tran
|
8c35832b28
|
Fixing getAllUsers again
|
2018-10-22 14:23:01 -04:00 |
|
Mary Tran
|
f12d7aa693
|
Added admin first, and fixed getAllUsers
|
2018-10-21 21:27:35 -04:00 |
|
Mary Tran
|
3288d51cf7
|
Add Admin first, always, and fixed getAllUsers
|
2018-10-21 21:13:11 -04:00 |
|
IvanaE
|
4a725dd6d6
|
added field validation
|
2018-10-21 16:34:47 -04:00 |
|
IvanaE
|
a1d92aa423
|
fixed welcome page?
|
2018-10-19 19:04:28 -04:00 |
|
IvanaE
|
d740cf72d3
|
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
|
8be4ccbbd7
|
Logic
|
2018-10-19 16:45:18 -04:00 |
|
IvanaE
|
fc2f8bba29
|
added logo
|
2018-10-18 12:32:21 -04:00 |
|
IvanaE
|
7edfe3a185
|
changed cursor from pink to white - gotta stay on brand
|
2018-10-18 11:55:18 -04:00 |
|
IvanaE
|
114c698b61
|
made password field not visible, pop up text white instead of pink
|
2018-10-18 11:48:01 -04:00 |
|
IvanaE
|
173f6097fd
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
# OlympusServices/app/src/main/res/layout/activity_log_in.xml
|
2018-10-18 11:36:47 -04:00 |
|
IvanaE
|
f1c28f1a4c
|
made layout look good on actual phones
|
2018-10-18 11:33:05 -04:00 |
|
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
|
9bb3534191
|
Update README.md
|
2018-10-17 13:20:45 -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
|
1014a78de8
|
Merge pull request #1 from ebivibe/dbBranch
Added DBHelper for database access and DBTest. Added constructors, se…
|
2018-10-08 19:53:05 -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 |
|
Batuhan Berk Başoğlu
|
bba1c248a1
|
fixed UML Class Diagram
|
2018-10-05 23:52:50 -04:00 |
|
Batuhan Berk Başoğlu
|
b22a32b4a2
|
Fixed UML Class Diagram
|
2018-10-05 23:51:28 -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
|
50b0fc49c1
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-04 13:24:26 -04:00 |
|
IvanaE
|
036c03f07e
|
added all pages, using premade components
|
2018-10-04 13:23:53 -04:00 |
|
Batuhan Berk Başoğlu
|
0aed26f071
|
I made a empty file for UML Class
|
2018-09-28 22:23:37 -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 |
|
IvanaE
|
7bcf4fcf7c
|
Initial commit
|
2018-09-18 13:01:34 -04:00 |
|