SEG2105-Olympus-Android-Application

batuhan-basoglu/SEG2105-Olympus-Android-Application

Fork 0

Commit graph

2da777b576 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-23 17:16:36 -0400
0c50fa73f8 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-23 17:16:36 -0400
22cfef6b7b fixed security of users IvanaE 2018-10-23 17:16:18 -0400
2002092458 fixed security of users IvanaE 2018-10-23 17:16:18 -0400
1f822b8181 Add files via upload IvanaE 2018-10-23 00:03:49 -0400
ef441ec6fe Add files via upload IvanaE 2018-10-23 00:03:49 -0400
4fe5b70d6e Changed ListView to GridView for admin welcome page Mary Tran 2018-10-22 23:09:55 -0400
27bc56bc7f Changed ListView to GridView for admin welcome page Mary Tran 2018-10-22 23:09:55 -0400
c91d38cf18 added admin welcome page IvanaE 2018-10-22 14:48:11 -0400
5ebf406850 added admin welcome page IvanaE 2018-10-22 14:48:11 -0400
04362b99c0 Merge pull request #12 from ebivibe/DBBranch FunwithaPorpoise 2018-10-22 14:25:17 -0400
a76cced0fd Merge pull request #12 from ebivibe/DBBranch FunwithaPorpoise 2018-10-22 14:25:17 -0400
8c35832b28 Fixing getAllUsers again Mary Tran 2018-10-22 14:23:01 -0400
f1dd30d7bb Fixing getAllUsers again Mary Tran 2018-10-22 14:23:01 -0400
f12d7aa693 Added admin first, and fixed getAllUsers Mary Tran 2018-10-21 21:27:35 -0400
8e4c7c7a8e Added admin first, and fixed getAllUsers Mary Tran 2018-10-21 21:27:35 -0400
3288d51cf7 Add Admin first, always, and fixed getAllUsers Mary Tran 2018-10-21 21:13:11 -0400
6cbf771b82 Add Admin first, always, and fixed getAllUsers Mary Tran 2018-10-21 21:13:11 -0400
4a725dd6d6 added field validation IvanaE 2018-10-21 16:34:47 -0400
846df76cdb added field validation IvanaE 2018-10-21 16:34:47 -0400
a1d92aa423 fixed welcome page? IvanaE 2018-10-19 19:04:28 -0400
b5558cd3a7 fixed welcome page? IvanaE 2018-10-19 19:04:28 -0400
d740cf72d3 Merge branch 'lBranch' IvanaE 2018-10-19 19:02:28 -0400
6e01dd42a3 Merge branch 'lBranch' IvanaE 2018-10-19 19:02:28 -0400
8be4ccbbd7 Logic Anshu Sharma 2018-10-19 16:45:18 -0400
6d32b64e90 Logic Anshu Sharma 2018-10-19 16:45:18 -0400
fc2f8bba29 added logo IvanaE 2018-10-18 12:32:21 -0400
fb432776dd added logo IvanaE 2018-10-18 12:32:21 -0400
7edfe3a185 changed cursor from pink to white - gotta stay on brand IvanaE 2018-10-18 11:55:18 -0400
6e41f83316 changed cursor from pink to white - gotta stay on brand IvanaE 2018-10-18 11:55:18 -0400
114c698b61 made password field not visible, pop up text white instead of pink IvanaE 2018-10-18 11:48:01 -0400
f92a38c954 made password field not visible, pop up text white instead of pink IvanaE 2018-10-18 11:48:01 -0400
173f6097fd Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-18 11:36:47 -0400
7b90d4b807 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-18 11:36:47 -0400
f1c28f1a4c made layout look good on actual phones IvanaE 2018-10-18 11:33:05 -0400
bd0d8df3fb made layout look good on actual phones IvanaE 2018-10-18 11:33:05 -0400
9cd04e06da Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus Batuhan Berk Başoğlu 2018-10-17 17:53:59 -0400
903a599c88 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus Batuhan Berk Başoğlu 2018-10-17 17:53:59 -0400
5599bd9179 Changed UML Batuhan Berk Başoğlu 2018-10-17 17:53:33 -0400
d89ef6c758 Changed UML Batuhan Berk Başoğlu 2018-10-17 17:53:33 -0400
9bb3534191 Update README.md IvanaE 2018-10-17 13:20:45 -0400
a3eecc3084 Update README.md IvanaE 2018-10-17 13:20:45 -0400
6f9590413f gave credit to style repos, removed admin option from sign up drop down IvanaE 2018-10-15 10:36:54 -0400
633bfc8fe4 gave credit to style repos, removed admin option from sign up drop down IvanaE 2018-10-15 10:36:54 -0400
ab84abd042 Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 09:27:59 -0400
68d18fb23f Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 09:27:59 -0400
0d9cf73143 Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 00:05:55 -0400
12c3091a54 Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 00:05:55 -0400
7cde8be55a Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 00:02:58 -0400
3baeb2b679 Fixed UML Diagram Batuhan Berk Başoğlu 2018-10-14 00:02:58 -0400
296aaf05e3 fixed merge conflict, when you pull check the right dependency is in your build.gradle file IvanaE 2018-10-10 13:44:55 -0400
13de8619d9 fixed merge conflict, when you pull check the right dependency is in your build.gradle file IvanaE 2018-10-10 13:44:55 -0400
1014a78de8 Merge pull request #1 from ebivibe/dbBranch IvanaE 2018-10-08 19:53:05 -0400
1aa8e4c819 Merge pull request #1 from ebivibe/dbBranch IvanaE 2018-10-08 19:53:05 -0400
555932b877 Changed some unit test usernames to randomized string Mary Tran 2018-10-08 18:16:08 -0400
96ca7c8490 Changed some unit test usernames to randomized string Mary Tran 2018-10-08 18:16:08 -0400
a80c6d37dc Added docs and ability to get a list of all users from database Mary Tran 2018-10-08 18:00:21 -0400
a45341d30d Added docs and ability to get a list of all users from database Mary Tran 2018-10-08 18:00:21 -0400
5a382baab4 Running unit tests with Robolectric instead of starting up emulator every time Mary Tran 2018-10-08 16:25:15 -0400
5587abae8b Running unit tests with Robolectric instead of starting up emulator every time Mary Tran 2018-10-08 16:25:15 -0400
8ecd089fe3 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes Mary Tran 2018-10-08 11:48:58 -0400
0762919f74 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes Mary Tran 2018-10-08 11:48:58 -0400
bba1c248a1 fixed UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 23:52:50 -0400
f5eba5739d fixed UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 23:52:50 -0400
b22a32b4a2 Fixed UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 23:51:28 -0400
79a6b478c3 Fixed UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 23:51:28 -0400
aa102421ef another text fix IvanaE 2018-10-05 12:45:50 -0400
c873aee013 another text fix IvanaE 2018-10-05 12:45:50 -0400
e1b947ef43 fixed text IvanaE 2018-10-05 12:45:07 -0400
32f3656803 fixed text IvanaE 2018-10-05 12:45:07 -0400
0499d81093 added borders IvanaE 2018-10-05 12:38:13 -0400
d68e3a6384 added borders IvanaE 2018-10-05 12:38:13 -0400
0b36bb32e3 added appointment class and finished ui IvanaE 2018-10-05 12:35:05 -0400
cd4c3e1e3f added appointment class and finished ui IvanaE 2018-10-05 12:35:05 -0400
f299770923 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-05 11:57:47 -0400
0677226a71 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-05 11:57:47 -0400
6b1ff038c8 created class files for UserType, User, ServiceProvider, Admin, Service IvanaE 2018-10-05 11:57:32 -0400
6edf86c40a created class files for UserType, User, ServiceProvider, Admin, Service IvanaE 2018-10-05 11:57:32 -0400
bcfa204f44 fixed some file inconsistencies Batuhan Berk Başoğlu 2018-10-05 11:40:22 -0400
dda0a617ef fixed some file inconsistencies Batuhan Berk Başoğlu 2018-10-05 11:40:22 -0400
ac7e8aec0a fixed some file inconsistencies Batuhan Berk Başoğlu 2018-10-05 11:39:30 -0400
a8972e06c5 fixed some file inconsistencies Batuhan Berk Başoğlu 2018-10-05 11:39:30 -0400
a9746fb215 Made the UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 11:23:36 -0400
5cc2e33c79 Made the UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 11:23:36 -0400
65bc8b2109 Made the UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 11:20:01 -0400
c353be4cd2 Made the UML Class Diagram Batuhan Berk Başoğlu 2018-10-05 11:20:01 -0400
9cd853df11 fixed text colour IvanaE 2018-10-04 14:14:59 -0400
6bc415d57d fixed text colour IvanaE 2018-10-04 14:14:59 -0400
50b0fc49c1 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-04 13:24:26 -0400
9bd6704a27 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus IvanaE 2018-10-04 13:24:26 -0400
036c03f07e added all pages, using premade components IvanaE 2018-10-04 13:23:53 -0400
0aed26f071 I made a empty file for UML Class Batuhan Berk Başoğlu 2018-09-28 22:23:37 -0400
4f7a3ccdfb I made a empty file for UML Class Batuhan Berk Başoğlu 2018-09-28 22:23:37 -0400
5a97ad2ec8 added sign up page, still working on drop down menu IvanaE 2018-09-28 18:09:05 -0400
5663255788 Added android project IvanaE 2018-09-28 15:39:43 -0400
7bcf4fcf7c Initial commit IvanaE 2018-09-18 13:01:34 -0400