batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
SEG2105-Olympus-Android-App.../OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices
History
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
..
Admin.java Logic 2018-10-19 16:45:18 -04:00
Appointment.java added appointment class and finished ui 2018-10-05 12:35:05 -04:00
DBHelper.java Added docs and ability to get a list of all users from database 2018-10-08 18:00:21 -04:00
LogIn.java Merge branch 'lBranch' 2018-10-19 19:02:28 -04:00
Main.java Logic 2018-10-19 16:45:18 -04:00
Service.java created class files for UserType, User, ServiceProvider, Admin, Service 2018-10-05 11:57:32 -04:00
ServiceProvider.java Logic 2018-10-19 16:45:18 -04:00
SignUp.java Merge branch 'lBranch' 2018-10-19 19:02:28 -04:00
User.java Merge branch 'lBranch' 2018-10-19 19:02:28 -04:00
UserType.java Logic 2018-10-19 16:45:18 -04:00
Welcome.java Merge branch 'lBranch' 2018-10-19 19:02:28 -04:00