IvanaE
|
a422c6fc3d
|
how about now?
|
2018-11-13 13:49:26 -05:00 |
|
IvanaE
|
3e555f0b41
|
broken code will be fixed soon :(
|
2018-11-13 13:40:14 -05:00 |
|
FunwithaPorpoise
|
c6f089c951
|
Merge pull request #16 from ebivibe/DBBranch
Updated DBHelper for Deliverable 3
|
2018-11-11 23:27:18 -05:00 |
|
Mary Tran
|
7db152a0a8
|
Fixed HomeOwner to ServiceProvider
|
2018-11-11 23:25:07 -05:00 |
|
Mary Tran
|
91476b3ddc
|
Updated DBHelper for Deliverable 3
|
2018-11-11 22:55:47 -05:00 |
|
IvanaE
|
9ae4458e98
|
added latest updates
|
2018-11-11 18:35:17 -05:00 |
|
IvanaE
|
fbc434c60b
|
deliverable 3 ui, methods to be filled in
|
2018-11-11 15:52:55 -05:00 |
|
Anshu Sharma
|
8dfa481448
|
Comment '
|
2018-11-11 11:59:46 -05:00 |
|
Anshu Sharma
|
cac2532c5a
|
Fixed constructor
|
2018-11-11 11:40:03 -05:00 |
|
Anshu Sharma
|
8bdca52a6d
|
Availabilities
|
2018-11-11 11:37:05 -05:00 |
|
IvanaE
|
5e3a37d0e8
|
final ui changes
|
2018-11-09 23:32:40 -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
|
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 |
|
Mary Tran
|
6cbf771b82
|
Add Admin first, always, and fixed getAllUsers
|
2018-10-21 21:13:11 -04:00 |
|
IvanaE
|
846df76cdb
|
added field validation
|
2018-10-21 16:34:47 -04:00 |
|
IvanaE
|
b5558cd3a7
|
fixed welcome page?
|
2018-10-19 19:04:28 -04:00 |
|
IvanaE
|
6e01dd42a3
|
Merge branch 'lBranch'
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
# OlympusServices/.idea/vcs.xml
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
# OlympusServices/app/src/main/res/layout/activity_main.xml
# OlympusServices/app/src/main/res/layout/activity_sign_up.xml
# OlympusServices/build.gradle
|
2018-10-19 19:02:28 -04:00 |
|
Anshu Sharma
|
6d32b64e90
|
Logic
|
2018-10-19 16:45:18 -04:00 |
|
IvanaE
|
fb432776dd
|
added logo
|
2018-10-18 12:32:21 -04:00 |
|
IvanaE
|
6e41f83316
|
changed cursor from pink to white - gotta stay on brand
|
2018-10-18 11:55:18 -04:00 |
|
IvanaE
|
f92a38c954
|
made password field not visible, pop up text white instead of pink
|
2018-10-18 11:48:01 -04:00 |
|
IvanaE
|
7b90d4b807
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
# OlympusServices/app/src/main/res/layout/activity_log_in.xml
|
2018-10-18 11:36:47 -04:00 |
|
IvanaE
|
bd0d8df3fb
|
made layout look good on actual phones
|
2018-10-18 11:33:05 -04:00 |
|
|
|
903a599c88
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-17 17:53:59 -04:00 |
|
|
|
d89ef6c758
|
Changed UML
|
2018-10-17 17:53:33 -04:00 |
|
IvanaE
|
633bfc8fe4
|
gave credit to style repos, removed admin option from sign up drop down
|
2018-10-15 10:36:54 -04:00 |
|
|
|
12c3091a54
|
Fixed UML Diagram
|
2018-10-14 00:05:55 -04:00 |
|
|
|
3baeb2b679
|
Fixed UML Diagram
|
2018-10-14 00:02:58 -04:00 |
|
IvanaE
|
13de8619d9
|
fixed merge conflict, when you pull check the right dependency is in your build.gradle file
|
2018-10-10 13:44:55 -04:00 |
|
Mary Tran
|
96ca7c8490
|
Changed some unit test usernames to randomized string
|
2018-10-08 18:16:08 -04:00 |
|
Mary Tran
|
a45341d30d
|
Added docs and ability to get a list of all users from database
|
2018-10-08 18:00:21 -04:00 |
|
Mary Tran
|
5587abae8b
|
Running unit tests with Robolectric instead of starting up emulator every time
|
2018-10-08 16:25:15 -04:00 |
|
Mary Tran
|
0762919f74
|
Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes
|
2018-10-08 11:48:58 -04:00 |
|
IvanaE
|
c873aee013
|
another text fix
|
2018-10-05 12:45:50 -04:00 |
|
IvanaE
|
32f3656803
|
fixed text
|
2018-10-05 12:45:07 -04:00 |
|
IvanaE
|
d68e3a6384
|
added borders
|
2018-10-05 12:38:13 -04:00 |
|
IvanaE
|
cd4c3e1e3f
|
added appointment class and finished ui
|
2018-10-05 12:35:05 -04:00 |
|
IvanaE
|
6edf86c40a
|
created class files for UserType, User, ServiceProvider, Admin, Service
|
2018-10-05 11:57:32 -04:00 |
|
IvanaE
|
6bc415d57d
|
fixed text colour
|
2018-10-04 14:14:59 -04:00 |
|
IvanaE
|
036c03f07e
|
added all pages, using premade components
|
2018-10-04 13:23:53 -04:00 |
|
IvanaE
|
5a97ad2ec8
|
added sign up page, still working on drop down menu
|
2018-09-28 18:09:05 -04:00 |
|
IvanaE
|
5663255788
|
Added android project
|
2018-09-28 15:39:43 -04:00 |
|
