Batuhan Berk Başoğlu
|
e45e742d71
|
merging with master
|
2018-11-14 12:34:44 -05:00 |
|
Batuhan Berk Başoğlu
|
3be59387a4
|
Updated the branch
|
2018-11-14 12:26:28 -05:00 |
|
IvanaE
|
3155b66a7e
|
layout fixes
|
2018-11-13 22:29:17 -05:00 |
|
IvanaE
|
94b333ded9
|
fixed availability time formating
|
2018-11-13 22:20:01 -05:00 |
|
IvanaE
|
4a7c058c5f
|
actually fixed license this time
|
2018-11-13 22:14:51 -05:00 |
|
IvanaE
|
a88a575e7c
|
fixed sort of
|
2018-11-13 22:11:19 -05:00 |
|
IvanaE
|
696c4e4e4b
|
fixed services page
|
2018-11-13 21:54:44 -05:00 |
|
Batuhan Berk Başoğlu
|
0ae6c76777
|
Deleted useless docx file
|
2018-11-13 16:10:57 -05:00 |
|
Batuhan Berk Başoğlu
|
d4fd4900ed
|
Fixed UML
|
2018-11-13 16:07:24 -05:00 |
|
IvanaE
|
caafe441b9
|
fixes still needed
|
2018-11-13 15:17:41 -05:00 |
|
IvanaE
|
a517c63e7a
|
finished edit profile?
|
2018-11-13 14:21:45 -05:00 |
|
IvanaE
|
bf2b4ae004
|
think i got them all
|
2018-11-13 14:00:01 -05:00 |
|
IvanaE
|
c3f35ad540
|
pls work
|
2018-11-13 13:57:03 -05:00 |
|
IvanaE
|
e374be7175
|
one more go
|
2018-11-13 13:53:55 -05:00 |
|
IvanaE
|
4202da62cb
|
how about now?
|
2018-11-13 13:49:26 -05:00 |
|
IvanaE
|
1da25d2aff
|
broken code will be fixed soon :(
|
2018-11-13 13:40:14 -05:00 |
|
Batuhan Berk Başoğlu
|
19b42bf9a5
|
Updated UML Diagram
|
2018-11-12 17:26:29 -05:00 |
|
FunwithaPorpoise
|
ad48945e19
|
Merge pull request #16 from ebivibe/DBBranch
Updated DBHelper for Deliverable 3
|
2018-11-11 23:27:18 -05:00 |
|
Mary Tran
|
39b59d5660
|
Fixed HomeOwner to ServiceProvider
|
2018-11-11 23:25:07 -05:00 |
|
Mary Tran
|
9a93d20dce
|
Updated DBHelper for Deliverable 3
|
2018-11-11 22:55:47 -05:00 |
|
IvanaE
|
6b0686fbdf
|
added latest updates
|
2018-11-11 18:35:17 -05:00 |
|
IvanaE
|
32f1031782
|
deliverable 3 ui, methods to be filled in
|
2018-11-11 15:52:55 -05:00 |
|
Anshu Sharma
|
16e39ff120
|
changes
|
2018-11-11 12:15:02 -05:00 |
|
Anshu Sharma
|
9c6c3ea257
|
Comment '
|
2018-11-11 11:59:46 -05:00 |
|
Batuhan Berk Başoğlu
|
4fd07d81b1
|
Updated UML Diagram
|
2018-11-11 11:47:23 -05:00 |
|
Anshu Sharma
|
b730557cec
|
Fixed constructor
|
2018-11-11 11:40:03 -05:00 |
|
Anshu Sharma
|
65fc33daa1
|
Availabilities
|
2018-11-11 11:37:05 -05:00 |
|
IvanaE
|
47a422705d
|
added deliverable 2 submission
|
2018-11-09 23:40:13 -05:00 |
|
IvanaE
|
bd8ef59874
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-09 23:32:59 -05:00 |
|
IvanaE
|
89985db38f
|
final ui changes
|
2018-11-09 23:32:40 -05:00 |
|
Batuhan Berk Başoğlu
|
38f3a14dbf
|
changed uml
|
2018-11-09 21:42:58 -05:00 |
|
IvanaE
|
d5824827cf
|
Update README.md
|
2018-11-09 17:52:30 -05:00 |
|
IvanaE
|
1d8b1d6dfb
|
removed comma
|
2018-11-09 17:51:14 -05:00 |
|
IvanaE
|
8e3c6db4ef
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-09 17:36:11 -05:00 |
|
IvanaE
|
5687572fda
|
made ui look pretty
|
2018-11-09 17:35:48 -05:00 |
|
Anshu Sharma
|
24c15fafa0
|
fix conflict
|
2018-11-09 11:53:12 -05:00 |
|
Anshu Sharma
|
163b1173cf
|
comments for project.
|
2018-11-09 11:48:05 -05:00 |
|
IvanaE
|
df6c25b065
|
fixed password length
|
2018-11-08 11:43:43 -05:00 |
|
IvanaE
|
8ae08f829b
|
added service exists verification
|
2018-11-07 14:16:54 -05:00 |
|
IvanaE
|
cc8e5946c5
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-07 13:50:58 -05:00 |
|
IvanaE
|
95e281fc87
|
added field checking, fixed some errors
|
2018-11-07 13:50:10 -05:00 |
|
Batuhan Berk Başoğlu
|
d1f7e5a81c
|
Added comments to test files
|
2018-11-07 13:47:06 -05:00 |
|
Batuhan Berk Başoğlu
|
c5d85d3f5c
|
Testing
|
2018-11-07 13:28:41 -05:00 |
|
IvanaE
|
f615b2f6e1
|
file wasn't stages
|
2018-11-07 11:39:37 -05:00 |
|
IvanaE
|
4520816740
|
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
|
ef6446f05b
|
chaoe ensuing
|
2018-11-07 11:28:54 -05:00 |
|
Anshu Sharma
|
d4f1433f91
|
whatever
|
2018-11-07 11:26:51 -05:00 |
|
Batuhan Basoglu
|
aa56f4d772
|
testing 123
|
2018-11-03 22:54:32 -04:00 |
|
IvanaE
|
c11c42c305
|
removed USELESS file
|
2018-11-02 19:07:36 -04:00 |
|
IvanaE
|
88c6150dff
|
Create config.yml
|
2018-11-02 19:03:47 -04:00 |
|