IvanaE
|
ec9fabdef2
|
latest code
|
2018-11-28 22:12:08 -05:00 |
|
|
|
611cf2934c
|
Added comments
|
2018-11-27 17:30:53 -05:00 |
|
IvanaE
|
5faed3fd4a
|
new ui for del 4
|
2018-11-26 21:09:54 -05:00 |
|
|
|
269ce3fa7f
|
Build has been created
|
2018-11-23 12:03:36 -05:00 |
|
IvanaE
|
ed1c35d487
|
actually fixed errors?
|
2018-11-19 21:52:14 -05:00 |
|
|
|
d6117810be
|
pulling
|
2018-11-18 15:05:25 -05:00 |
|
IvanaE
|
cb06782c04
|
fixed bad constructor
|
2018-11-16 15:50:56 -05:00 |
|
|
|
22d678be9e
|
Added comments
|
2018-11-16 12:30:21 -05:00 |
|
Anshu Sharma
|
57fdeae53a
|
check
|
2018-11-14 21:21:27 -05:00 |
|
IvanaE
|
b7cc459862
|
fixed spinner i think?
|
2018-11-14 20:38:39 -05:00 |
|
IvanaE
|
6f88a7bc71
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
|
2018-11-14 14:15:06 -05:00 |
|
IvanaE
|
ac5b0fc972
|
fixed small errors
|
2018-11-14 14:14:22 -05:00 |
|
|
|
cc2e0566df
|
Finished the test files
|
2018-11-14 13:59:26 -05:00 |
|
|
|
3470b334ca
|
Updated the branch
|
2018-11-14 12:26:28 -05:00 |
|
|
|
725bf4dbd4
|
Fixed UML
|
2018-11-13 16:07:24 -05:00 |
|
IvanaE
|
3e555f0b41
|
broken code will be fixed soon :(
|
2018-11-13 13:40:14 -05:00 |
|
|
|
18715dc5fb
|
Updated UML Diagram
|
2018-11-12 17:26:29 -05:00 |
|
IvanaE
|
fbc434c60b
|
deliverable 3 ui, methods to be filled in
|
2018-11-11 15:52:55 -05:00 |
|
|
|
20e5eb8d17
|
Updated UML Diagram
|
2018-11-11 11:47:23 -05:00 |
|
Anshu Sharma
|
970c3422f4
|
comments for project.
|
2018-11-09 11:48:05 -05:00 |
|
IvanaE
|
b8ea57317e
|
Merge branch 'lBranch'
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
|
2018-11-07 11:39:08 -05:00 |
|
IvanaE
|
0445964fbb
|
chaoe ensuing
|
2018-11-07 11:28:54 -05:00 |
|
Anshu Sharma
|
b31edbb3df
|
whatever
|
2018-11-07 11:26:51 -05:00 |
|
|
|
03558823e9
|
Merged JUnit with Master
|
2018-11-02 11:40:15 -04:00 |
|
|
|
a9f26d7261
|
Fixed the order of tests
|
2018-11-01 21:09:22 -04:00 |
|
IvanaE
|
ed6927b7db
|
trying some wild stuff
|
2018-11-01 12:49:40 -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 |
|
