Commit graph

110 commits

Author SHA1 Message Date
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
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