|
|
3470b334ca
|
Updated the branch
|
2018-11-14 12:26:28 -05:00 |
|
|
|
a9f26d7261
|
Fixed the order of tests
|
2018-11-01 21:09:22 -04:00 |
|
|
|
518f765d8e
|
Added basic JUnit files
|
2018-10-31 13:24:01 -04:00 |
|
IvanaE
|
fd2cf0fe0d
|
added popups and services
|
2018-10-28 19:31:34 -04:00 |
|
|
|
ae62f10b99
|
Updated UML Diagram for Deliverable 2
|
2018-10-26 14:43:41 -04:00 |
|
IvanaE
|
5ebf406850
|
added admin welcome page
|
2018-10-22 14:48:11 -04:00 |
|
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 |
|
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 |
|
|
|
3baeb2b679
|
Fixed UML Diagram
|
2018-10-14 00:02:58 -04:00 |
|
|
|
a8972e06c5
|
fixed some file inconsistencies
|
2018-10-05 11:39:30 -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 |
|
