Commit graph

8 commits

Author SHA1 Message Date
IvanaE
7790edac33 added popups and services 2018-10-28 19:31:34 -04:00
IvanaE
fc2f8bba29 added logo 2018-10-18 12:32:21 -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
5599bd9179 Changed UML 2018-10-17 17:53:33 -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