Commit graph

16 commits

Author SHA1 Message Date
IvanaE
ef7d9db62b added more of the finding and edit profile 2018-11-18 15:35:32 -05:00
IvanaE
489141194d updates needed 2018-11-18 14:48:15 -05:00
IvanaE
d15af93180 added new activities, started find service provider 2018-11-18 13:26:50 -05:00
IvanaE
ac5b0fc972 fixed small errors 2018-11-14 14:14:22 -05:00
IvanaE
3e555f0b41 broken code will be fixed soon :( 2018-11-13 13:40:14 -05:00
IvanaE
fbc434c60b deliverable 3 ui, methods to be filled in 2018-11-11 15:52:55 -05:00
IvanaE
56c816b10a made ui look pretty 2018-11-09 17:35:48 -05:00
IvanaE
fd2cf0fe0d added popups and services 2018-10-28 19:31:34 -04:00
IvanaE
2002092458 fixed security of users 2018-10-23 17:16:18 -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
fb432776dd added logo 2018-10-18 12:32:21 -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