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 |
|
IvanaE
|
76f860b9eb
|
Delete config.yml
|
2018-11-02 19:03:11 -04:00 |
|
IvanaE
|
a92cda9aed
|
Create config.yml
|
2018-11-02 19:02:09 -04:00 |
|
IvanaE
|
e02b30c0ba
|
no message
|
2018-11-02 18:57:00 -04:00 |
|
IvanaE
|
ab9fa36a68
|
fixed indenting
|
2018-11-02 18:50:00 -04:00 |
|
IvanaE
|
59317ddf37
|
already so done with circle ci
|
2018-11-02 18:49:26 -04:00 |
|
IvanaE
|
676c92763e
|
trying changing path
|
2018-11-02 18:41:07 -04:00 |
|
IvanaE
|
62fd194ad9
|
one more time
|
2018-11-02 18:39:32 -04:00 |
|
IvanaE
|
4831f71cd4
|
trying circle ci again :(
|
2018-11-02 18:35:56 -04:00 |
|
IvanaE
|
dff3eda2f5
|
added circle ci config
|
2018-11-02 18:32:44 -04:00 |
|
IvanaE
|
e38d34b9eb
|
fixed table alignment
|
2018-11-02 18:14:32 -04:00 |
|
IvanaE
|
afe8db8c2d
|
Update README.md
|
2018-11-02 12:25:07 -04:00 |
|
Batuhan Berk Başoğlu
|
0d0fa1ed99
|
Updated readme file
|
2018-11-02 12:18:54 -04:00 |
|
Batuhan Berk Başoğlu
|
0ad149265f
|
Merged JUnit with Master
|
2018-11-02 11:40:15 -04:00 |
|
Batuhan Berk Başoğlu
|
4862bc8a7b
|
made some fix
|
2018-11-02 00:19:46 -04:00 |
|
Batuhan Berk Başoğlu
|
295242e572
|
added all test files
|
2018-11-02 00:18:07 -04:00 |
|
Batuhan Berk Başoğlu
|
4fcbb34f38
|
made 3 test cases for each class
|
2018-11-01 23:17:34 -04:00 |
|
Batuhan Berk Başoğlu
|
672a241e88
|
Fixed test files
|
2018-11-01 21:29:48 -04:00 |
|
Batuhan Berk Başoğlu
|
3a4c792cb5
|
Added more test cases
|
2018-11-01 21:17:32 -04:00 |
|
Batuhan Berk Başoğlu
|
2ea28277c3
|
Fixed the order of tests
|
2018-11-01 21:09:22 -04:00 |
|
Batuhan Berk Başoğlu
|
45ede0cbd5
|
Added JUnit for SignUp
|
2018-11-01 21:04:55 -04:00 |
|
IvanaE
|
33611b8983
|
can no longer edit service name
|
2018-11-01 20:30:03 -04:00 |
|
IvanaE
|
ea0e8bd7d1
|
made it look pretty
|
2018-11-01 19:51:35 -04:00 |
|
IvanaE
|
8ac71c9cac
|
fixed ui elements
|
2018-11-01 14:42:04 -04:00 |
|
IvanaE
|
6f49545aba
|
fixed ui elements
|
2018-11-01 14:40:25 -04:00 |
|
IvanaE
|
695ab61b15
|
trying some wild stuff
|
2018-11-01 12:49:40 -04:00 |
|
Batuhan Berk Başoğlu
|
aa0fa2a4ba
|
Updated test files
|
2018-10-31 13:31:46 -04:00 |
|
Batuhan Berk Başoğlu
|
ec69678da4
|
Added basic JUnit files
|
2018-10-31 13:24:01 -04:00 |
|
FunwithaPorpoise
|
674ed9352f
|
Merge pull request #15 from ebivibe/DBBranch
Changing gridview text colour to white
|
2018-10-31 12:58:05 -04:00 |
|
Mary Tran
|
39ba11d11b
|
Changing gridview text colour to white
|
2018-10-31 12:55:15 -04:00 |
|
Mary Tran
|
23293089cb
|
Increased DB version. Changed User to HomeOwner in existing DBs
|
2018-10-30 12:24:46 -04:00 |
|
IvanaE
|
8b2532d27e
|
made it pretty
|
2018-10-30 11:16:56 -04:00 |
|
IvanaE
|
073885ebeb
|
accidentally changed to many things
|
2018-10-30 11:16:06 -04:00 |
|
IvanaE
|
3491212fbc
|
refactored user to homeowner
|
2018-10-30 11:08:08 -04:00 |
|
IvanaE
|
7790edac33
|
added popups and services
|
2018-10-28 19:31:34 -04:00 |
|
FunwithaPorpoise
|
60c0da3558
|
Merge pull request #14 from ebivibe/DBBranch
Db branch
|
2018-10-26 22:25:34 -04:00 |
|
Batuhan Berk Başoğlu
|
6c270be5ce
|
Updated UML Diagram for Deliverable 2
|
2018-10-26 14:43:41 -04:00 |
|
Mary Tran
|
7646deb05b
|
Replacing a relic from the past
|
2018-10-25 21:24:33 -04:00 |
|
Mary Tran
|
97148737de
|
Added Integration Tests for services table
|
2018-10-25 16:43:08 -04:00 |
|
Mary Tran
|
d29b03972e
|
Added new table for services. Not tested yet
|
2018-10-25 16:14:38 -04:00 |
|
IvanaE
|
319428eebb
|
updated zip
|
2018-10-23 17:24:38 -04:00 |
|
IvanaE
|
2da777b576
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-23 17:16:36 -04:00 |
|
IvanaE
|
22cfef6b7b
|
fixed security of users
|
2018-10-23 17:16:18 -04:00 |
|
IvanaE
|
1f822b8181
|
Add files via upload
added deliverable 1 submission
|
2018-10-23 00:03:49 -04:00 |
|
Mary Tran
|
4fe5b70d6e
|
Changed ListView to GridView for admin welcome page
|
2018-10-22 23:09:55 -04:00 |
|