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
|
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 |
|
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
|
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
|
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 |
|
|
|
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 |
|
Mary Tran
|
0e7b23ac57
|
Changing gridview text colour to white
|
2018-10-31 12:55:15 -04:00 |
|
Mary Tran
|
461c696a59
|
Increased DB version. Changed User to HomeOwner in existing DBs
|
2018-10-30 12:24:46 -04:00 |
|
IvanaE
|
f5bc54316a
|
made it pretty
|
2018-10-30 11:16:56 -04:00 |
|
IvanaE
|
f0b25cb4da
|
accidentally changed to many things
|
2018-10-30 11:16:06 -04:00 |
|
IvanaE
|
fece5c7758
|
refactored user to homeowner
|
2018-10-30 11:08:08 -04:00 |
|
IvanaE
|
fd2cf0fe0d
|
added popups and services
|
2018-10-28 19:31:34 -04:00 |
|
Mary Tran
|
c4981f60f9
|
Replacing a relic from the past
|
2018-10-25 21:24:33 -04:00 |
|
Mary Tran
|
48ac26f804
|
Added Integration Tests for services table
|
2018-10-25 16:43:08 -04:00 |
|
Mary Tran
|
4c6b7686af
|
Added new table for services. Not tested yet
|
2018-10-25 16:14:38 -04:00 |
|
IvanaE
|
2002092458
|
fixed security of users
|
2018-10-23 17:16:18 -04:00 |
|
Mary Tran
|
27bc56bc7f
|
Changed ListView to GridView for admin welcome page
|
2018-10-22 23:09:55 -04:00 |
|
IvanaE
|
5ebf406850
|
added admin welcome page
|
2018-10-22 14:48:11 -04:00 |
|
Mary Tran
|
f1dd30d7bb
|
Fixing getAllUsers again
|
2018-10-22 14:23:01 -04:00 |
|
Mary Tran
|
8e4c7c7a8e
|
Added admin first, and fixed getAllUsers
|
2018-10-21 21:27:35 -04:00 |
|
