IvanaE
|
b857c93aff
|
added deliverable 2 submission
|
2018-11-09 23:40:13 -05:00 |
|
IvanaE
|
fec4574f7c
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-09 23:32:59 -05:00 |
|
IvanaE
|
5e3a37d0e8
|
final ui changes
|
2018-11-09 23:32:40 -05:00 |
|
|
|
9a18570b1c
|
changed uml
|
2018-11-09 21:42:58 -05:00 |
|
IvanaE
|
4ad2028dd3
|
Update README.md
|
2018-11-09 17:52:30 -05:00 |
|
IvanaE
|
288cb14f69
|
removed comma
|
2018-11-09 17:51:14 -05:00 |
|
IvanaE
|
0a49bb14d4
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-09 17:36:11 -05:00 |
|
IvanaE
|
56c816b10a
|
made ui look pretty
|
2018-11-09 17:35:48 -05:00 |
|
Anshu Sharma
|
926ffa89b2
|
fix conflict
|
2018-11-09 11:53:12 -05:00 |
|
Anshu Sharma
|
970c3422f4
|
comments for project.
|
2018-11-09 11:48:05 -05:00 |
|
IvanaE
|
21359e5aaf
|
fixed password length
|
2018-11-08 11:43:43 -05:00 |
|
IvanaE
|
e37019dd41
|
added service exists verification
|
2018-11-07 14:16:54 -05:00 |
|
IvanaE
|
d984df34ae
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-07 13:50:58 -05:00 |
|
IvanaE
|
46ffe2b2e5
|
added field checking, fixed some errors
|
2018-11-07 13:50:10 -05:00 |
|
|
|
57429abb8e
|
Added comments to test files
|
2018-11-07 13:47:06 -05:00 |
|
|
|
ce0ead94e0
|
Testing
|
2018-11-07 13:28:41 -05:00 |
|
IvanaE
|
c5f5157ef1
|
file wasn't stages
|
2018-11-07 11:39:37 -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 |
|
Batuhan Basoglu
|
135c8346ce
|
testing 123
|
2018-11-03 22:54:32 -04:00 |
|
IvanaE
|
f1fdbe843b
|
removed USELESS file
|
2018-11-02 19:07:36 -04:00 |
|
IvanaE
|
ab5680c734
|
Create config.yml
|
2018-11-02 19:03:47 -04:00 |
|
IvanaE
|
0a2df8fe1f
|
Delete config.yml
|
2018-11-02 19:03:11 -04:00 |
|
IvanaE
|
58f077353f
|
Create config.yml
|
2018-11-02 19:02:09 -04:00 |
|
IvanaE
|
c4099b64ba
|
no message
|
2018-11-02 18:57:00 -04:00 |
|
IvanaE
|
da6a01b935
|
fixed indenting
|
2018-11-02 18:50:00 -04:00 |
|
IvanaE
|
64924b16c9
|
already so done with circle ci
|
2018-11-02 18:49:26 -04:00 |
|
IvanaE
|
9d63942fd5
|
trying changing path
|
2018-11-02 18:41:07 -04:00 |
|
IvanaE
|
8d570d4470
|
one more time
|
2018-11-02 18:39:32 -04:00 |
|
IvanaE
|
ad80e31740
|
trying circle ci again :(
|
2018-11-02 18:35:56 -04:00 |
|
IvanaE
|
1822ad1818
|
added circle ci config
|
2018-11-02 18:32:44 -04:00 |
|
IvanaE
|
e787613704
|
fixed table alignment
|
2018-11-02 18:14:32 -04:00 |
|
IvanaE
|
3850c02c1f
|
Update README.md
|
2018-11-02 12:25:07 -04:00 |
|
|
|
66b77a19d2
|
Updated readme file
|
2018-11-02 12:18:54 -04:00 |
|
|
|
03558823e9
|
Merged JUnit with Master
|
2018-11-02 11:40:15 -04:00 |
|
|
|
36b09aa724
|
made some fix
|
2018-11-02 00:19:46 -04:00 |
|
|
|
3f8d9e9853
|
added all test files
|
2018-11-02 00:18:07 -04:00 |
|
|
|
e9ee14542c
|
made 3 test cases for each class
|
2018-11-01 23:17:34 -04:00 |
|
|
|
ac00abfa53
|
Fixed test files
|
2018-11-01 21:29:48 -04:00 |
|
|
|
c2caecba4a
|
Added more test cases
|
2018-11-01 21:17:32 -04:00 |
|
|
|
a9f26d7261
|
Fixed the order of tests
|
2018-11-01 21:09:22 -04:00 |
|
|
|
94e4bb4286
|
Added JUnit for SignUp
|
2018-11-01 21:04:55 -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 |
|
|
|
e18b97a1a9
|
Updated test files
|
2018-10-31 13:31:46 -04:00 |
|
|
|
518f765d8e
|
Added basic JUnit files
|
2018-10-31 13:24:01 -04:00 |
|
