Commit graph

42 commits

Author SHA1 Message Date
IvanaE
1cc89a1cb7 layout fixes 2018-11-13 22:29:17 -05:00
IvanaE
65c906b1f9 fixed sort of 2018-11-13 22:11:19 -05:00
IvanaE
06310f1b90 fixed services page 2018-11-13 21:54:44 -05:00
IvanaE
995142d117 finished edit profile? 2018-11-13 14:21:45 -05:00
IvanaE
3e555f0b41 broken code will be fixed soon :( 2018-11-13 13:40:14 -05:00
IvanaE
9ae4458e98 added latest updates 2018-11-11 18:35:17 -05:00
IvanaE
fbc434c60b deliverable 3 ui, methods to be filled in 2018-11-11 15:52:55 -05:00
Anshu Sharma
8bdca52a6d Availabilities 2018-11-11 11:37:05 -05:00
IvanaE
5e3a37d0e8 final ui changes 2018-11-09 23:32:40 -05:00
IvanaE
56c816b10a made ui look pretty 2018-11-09 17:35:48 -05:00
IvanaE
46ffe2b2e5 added field checking, fixed some errors 2018-11-07 13:50:10 -05:00
IvanaE
e787613704 fixed table alignment 2018-11-02 18:14:32 -04:00
IvanaE
ac45779b27 can no longer edit service name 2018-11-01 20:30:03 -04:00
IvanaE
3fe77feeb5 made it look pretty 2018-11-01 19:51:35 -04:00
IvanaE
e14c3bd0b3 fixed ui elements 2018-11-01 14:42:04 -04:00
IvanaE
e029609918 fixed ui elements 2018-11-01 14:40:25 -04:00
IvanaE
ed6927b7db trying some wild stuff 2018-11-01 12:49:40 -04:00
Mary Tran
0e7b23ac57 Changing gridview text colour to white 2018-10-31 12:55:15 -04: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
Mary Tran
27bc56bc7f Changed ListView to GridView for admin welcome page 2018-10-22 23:09:55 -04:00
IvanaE
5ebf406850 added admin welcome page 2018-10-22 14:48:11 -04:00
IvanaE
846df76cdb added field validation 2018-10-21 16:34:47 -04:00
IvanaE
b5558cd3a7 fixed welcome page? 2018-10-19 19:04:28 -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
6e41f83316 changed cursor from pink to white - gotta stay on brand 2018-10-18 11:55:18 -04:00
IvanaE
f92a38c954 made password field not visible, pop up text white instead of pink 2018-10-18 11:48:01 -04:00
IvanaE
7b90d4b807 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
bd0d8df3fb made layout look good on actual phones 2018-10-18 11:33:05 -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
IvanaE
c873aee013 another text fix 2018-10-05 12:45:50 -04:00
IvanaE
32f3656803 fixed text 2018-10-05 12:45:07 -04:00
IvanaE
d68e3a6384 added borders 2018-10-05 12:38:13 -04:00
IvanaE
cd4c3e1e3f added appointment class and finished ui 2018-10-05 12:35:05 -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