batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
172 commits 6 branches 0 tags 146 MiB
Commit graph

130 commits

Author SHA1 Message Date
IvanaE
89985db38f final ui changes 2018-11-09 23:32:40 -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
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
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
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
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
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
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
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
22cfef6b7b fixed security of users 2018-10-23 17:16:18 -04:00
Mary Tran
4fe5b70d6e Changed ListView to GridView for admin welcome page 2018-10-22 23:09:55 -04:00
IvanaE
c91d38cf18 added admin welcome page 2018-10-22 14:48:11 -04:00
Mary Tran
8c35832b28 Fixing getAllUsers again 2018-10-22 14:23:01 -04:00
Mary Tran
f12d7aa693 Added admin first, and fixed getAllUsers 2018-10-21 21:27:35 -04:00
Mary Tran
3288d51cf7 Add Admin first, always, and fixed getAllUsers 2018-10-21 21:13:11 -04:00
IvanaE
4a725dd6d6 added field validation 2018-10-21 16:34:47 -04:00
IvanaE
a1d92aa423 fixed welcome page? 2018-10-19 19:04:28 -04:00
IvanaE
d740cf72d3 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
8be4ccbbd7 Logic 2018-10-19 16:45:18 -04:00
IvanaE
fc2f8bba29 added logo 2018-10-18 12:32:21 -04:00
IvanaE
7edfe3a185 changed cursor from pink to white - gotta stay on brand 2018-10-18 11:55:18 -04:00
IvanaE
114c698b61 made password field not visible, pop up text white instead of pink 2018-10-18 11:48:01 -04:00
IvanaE
173f6097fd 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
f1c28f1a4c made layout look good on actual phones 2018-10-18 11:33:05 -04:00
Batuhan Berk Başoğlu
9cd04e06da Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-17 17:53:59 -04:00
Batuhan Berk Başoğlu
5599bd9179 Changed UML 2018-10-17 17:53:33 -04:00
IvanaE
6f9590413f gave credit to style repos, removed admin option from sign up drop down 2018-10-15 10:36:54 -04:00
Batuhan Berk Başoğlu
0d9cf73143 Fixed UML Diagram 2018-10-14 00:05:55 -04:00
Batuhan Berk Başoğlu
7cde8be55a Fixed UML Diagram 2018-10-14 00:02:58 -04:00
IvanaE
296aaf05e3 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
555932b877 Changed some unit test usernames to randomized string 2018-10-08 18:16:08 -04:00
Mary Tran
a80c6d37dc Added docs and ability to get a list of all users from database 2018-10-08 18:00:21 -04:00
Mary Tran
5a382baab4 Running unit tests with Robolectric instead of starting up emulator every time 2018-10-08 16:25:15 -04:00
Mary Tran
8ecd089fe3 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes 2018-10-08 11:48:58 -04:00
IvanaE
aa102421ef another text fix 2018-10-05 12:45:50 -04:00
IvanaE
e1b947ef43 fixed text 2018-10-05 12:45:07 -04:00
IvanaE
0499d81093 added borders 2018-10-05 12:38:13 -04:00
IvanaE
0b36bb32e3 added appointment class and finished ui 2018-10-05 12:35:05 -04:00
IvanaE
6b1ff038c8 created class files for UserType, User, ServiceProvider, Admin, Service 2018-10-05 11:57:32 -04:00
IvanaE
9cd853df11 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