Commit Graph

Select branches

Hide Pull Requests

add/more_animations

feature/explanation

master

update/notes_week9

v0.1.0

v0.1.1

v0.2

v0.2.1

v1.0

v1.0.0

Mono Color

• 231c580f7a Merge branch 'connect_new_extras' into 'master' Ceren Ugurlu 2019-04-08 09:27:16 +00:00
• 7867853cdb Upload coverage report cugurlu 2019-04-08 11:18:04 +02:00
• 39b108626b Upload checkstyle report cugurlu 2019-04-08 11:17:49 +02:00
• 8195650226 Fix all errors for extra activities cugurlu 2019-04-08 11:17:34 +02:00
• 9310674301 Fix checkstyle errors cugurlu 2019-04-08 11:17:02 +02:00
• 2025fd02cc Merge branch 'feature/localProduce_and_publicTransport' into 'master' Sem van der Hoeven 2019-04-07 17:57:01 +00:00
• 55fe2b6795 Merge branch 'develop_achievements' into 'master' Ceren Ugurlu 2019-04-07 16:00:55 +00:00
• b05b0ecaf7 DELETE::deleted the confirm methods for the extra activities Sem van der Hoeven 2019-04-07 17:55:57 +02:00
• e1489bda27 Update controllers for new properties of achievements cugurlu 2019-04-07 15:51:27 +02:00
• a2805c2a9f Update dashboard.fxml cugurlu 2019-04-07 15:50:31 +02:00
• 16fb86c513 Update achievements in userService cugurlu 2019-04-07 15:49:51 +02:00
• 1cd46940cf Add new achievement photos cugurlu 2019-04-07 15:48:55 +02:00
• e9efdf5f24 Merge branch 'master' into 'feature/localProduce_and_publicTransport' Sem van der Hoeven 2019-04-07 12:16:42 +00:00
• 86ec4bbd7d Merge branch 'update_calculator' into 'master' Ceren Ugurlu 2019-04-06 21:57:33 +00:00
• d210e22788 Fix ButtonSkin error cugurlu 2019-04-06 22:35:13 +02:00
• 1cf3af45be Add many new tests cugurlu 2019-04-06 22:30:46 +02:00
• 24be00d28a Update methods for extras cugurlu 2019-04-06 21:29:49 +02:00
• e30f312c6a Update calculator methods for new changes cugurlu 2019-04-06 21:26:52 +02:00
• 95d5b2b971 Fix the number of decimal points of footprints cugurlu 2019-04-06 21:26:17 +02:00
• c0e0063465 ADD::added animations to buttons in login and register window Sem van der Hoeven 2019-04-06 21:05:19 +02:00
• 61a99d47d1 ADD::added local produce and public transport sections to the extra activities section Sem van der Hoeven 2019-04-06 20:20:01 +02:00
• 6cbabbdf8d Merge branch 'update/achievements' into 'master' Sem van der Hoeven 2019-04-06 17:20:49 +00:00
• 2a873a78c9 Merge branch 'master' into 'update/achievements' Mika Wauben 2019-04-06 14:18:45 +00:00
• 0e546bc25c FIX:: checkstyle mlwauben 2019-04-06 16:14:17 +02:00
• 4293790ece FIX:: wrong test mlwauben 2019-04-06 15:42:14 +02:00
• 290694c5f1 Merge branch 'Feature/logoutbutton' into 'master' Mika Wauben 2019-04-06 13:37:35 +00:00
• eeb0fd9d57 ADD:: extra achievements and tests mlwauben 2019-04-06 15:36:44 +02:00
• 733c0c5920 Merge branch 'Test/achievement' into 'master' Ceren Ugurlu 2019-04-06 10:40:14 +00:00
• 238c00ff46 DEBUG:: logoutbutton mlwauben 2019-04-06 11:05:06 +02:00
• 4433d509bb ADD:: new achievements mlwauben 2019-04-06 10:33:36 +02:00
• 0f9cd14036 ADD:: line thingy above the logout button mlwauben 2019-04-06 09:18:24 +02:00
• 9af14e6015 ADD:: logout button mlwauben 2019-04-06 09:00:20 +02:00
• bce08eb6f2 DELETE::Wrong import that gave an error Merel Steenbergen 2019-04-05 20:40:50 +02:00
• dcb8404ae7 ADD::Method for achievement social butterfly Merel Steenbergen 2019-04-05 20:37:54 +02:00
• 82fd016590 FIX::No longer use Mockito for AchievementService in AchievementServiceTest Merel Steenbergen 2019-04-05 20:30:31 +02:00
• ccbe5968da EDIT::Finding bugs in tests and try to fix them Merel Steenbergen 2019-04-05 20:21:42 +02:00
• adb8406d4e ADD::Some tests to achievement class Merel Steenbergen 2019-04-05 19:59:57 +02:00
• 9ab4439f70 FIX::Illegal catch fix: RuntimeException to HttpClientErrorException Merel Steenbergen 2019-04-05 19:34:08 +02:00
• 47c46b5458 FIX::More CS errors Merel Steenbergen 2019-04-05 19:20:09 +02:00
• 02253cb645 FIX::Checkstyle errors Merel Steenbergen 2019-04-05 19:16:26 +02:00
• b92e302f8b ADD::Extra hints Merel Steenbergen 2019-04-05 19:11:51 +02:00
• 67b97eb331 FIXX:: Checkstyle Merel Steenbergen 2019-04-05 17:08:58 +02:00
• daa1c838b4 EDIT::Change some hints and add tests Merel Steenbergen 2019-04-05 17:00:45 +02:00
• 7228252169 Merge branch 'add/add_random_hints_to_GUI' into 'master' Merel Steenbergen 2019-04-05 14:49:28 +00:00
• 27a18659f8 Merge branch 'Feature/alerts' into 'master' Merel Steenbergen 2019-04-05 14:49:23 +00:00
• f2501f3624 FIX::Resolve a merge conflict with DashBoardController Merel Steenbergen 2019-04-05 13:18:21 +00:00
• 2b7d51a5ed EDIT::edited font size of random hints Sem van der Hoeven 2019-04-05 13:13:27 +02:00
• 75faf4ae8c ADD:added nodes and methods to display random hints to on the GUI Sem van der Hoeven 2019-04-05 13:11:17 +02:00
• 06daa4776f ADD::added animations to buttons on dashboard screen Sem van der Hoeven 2019-04-05 09:54:34 +02:00
• 4b07aa8072 EDIT::changed achievement picture, removed trademark and added it into the code Sem van der Hoeven 2019-04-05 09:24:58 +02:00
• 8927b78098 FIX:: Forgot to uncomment something. Pipeline should now work Merel Steenbergen 2019-04-04 21:02:06 +02:00
• 1f12291398 FIX::Import error Merel Steenbergen 2019-04-04 21:00:37 +02:00
• 1684068385 FIX::More CheckStyle errors Merel Steenbergen 2019-04-04 20:59:08 +02:00
• e929680477 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts Merel Steenbergen 2019-04-04 20:55:10 +02:00
• f23fc2cbea FIX::Checkstyle errors Merel Steenbergen 2019-04-04 20:54:50 +02:00
• 4fa2707add FIX:: Fixed small typing error in alert Merel Steenbergen 2019-04-04 18:51:04 +00:00
• 7ac5b1efda FIX:: Small bug fix, pipeline should now run Merel Steenbergen 2019-04-04 20:45:10 +02:00
• b08174b2ee ADD:: Alerts: username is now your friend and calculation saved. Merel Steenbergen 2019-04-04 20:42:25 +02:00
• 04db410293 FIX::Merge conflict fix in DashBoardController Merel Steenbergen 2019-04-04 20:36:37 +02:00
• c5e7ff2884 ADD::Alert for incorrect password/username at login. Merel Steenbergen 2019-04-04 20:35:02 +02:00
• c8521feaf8 ADD:: Alert 'Footprint saved. Still has a bug.' Merel Steenbergen 2019-04-03 21:51:35 +02:00
• 25a66832a5 ADD:: Alert for taken username Merel Steenbergen 2019-04-03 21:44:50 +02:00
• a55e4cecef Added class Hints, including tests Merel Steenbergen 2019-04-03 15:33:26 +02:00
• 5c85c56d78 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts Merel Steenbergen 2019-04-04 13:23:00 +02:00
• c79a98c57d ADD:: Alert 'Footprint saved. Still has a bug.' Merel Steenbergen 2019-04-03 21:51:35 +02:00
• 81701758d7 ADD:: Alert for taken username Merel Steenbergen 2019-04-03 21:44:50 +02:00
• 4b04487a25 Added class Hints, including tests Merel Steenbergen 2019-04-03 15:33:26 +02:00
• 50c27cf420 FIX::fixed checkstyle errors Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-04-04 13:16:33 +02:00
• 5526c8f467 FIX::fixed checkstyle errors Sem van der Hoeven 2019-04-04 13:14:03 +02:00
• 922a7d1fae Merge branch 'Feature/achievements' into 'master' Mika Wauben 2019-04-04 11:05:22 +00:00
• 6ced05278b ADD::added animations to extra activities section Sem van der Hoeven 2019-04-04 10:43:32 +02:00
• 9e6505dfa3 ADD::added animations to switching sections in calculator Sem van der Hoeven 2019-04-04 10:01:07 +02:00
• 86f1b724c7 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-04-04 09:27:52 +02:00
• 90d50624f6 EDIT::added imports to dashboard.fxml Sem van der Hoeven 2019-04-04 09:27:09 +02:00
• 82eb5575ee FIX:: checkstyle errors (except Cyclomatic Complexity ones) mlwauben 2019-04-04 08:00:47 +02:00
• 84154fca3a Merge branch 'master' into 'Feature/achievements' Mika Wauben 2019-04-04 05:45:17 +00:00
• 3aad682394 FIX:: (possible) merge conficts mlwauben 2019-04-03 22:05:48 +02:00
• b5c834fc52 ADD:: Alert 'Footprint saved. Still has a bug.' Merel Steenbergen 2019-04-03 21:51:35 +02:00
• 1ff84ce3d8 ADD:: Alert for taken username Merel Steenbergen 2019-04-03 21:44:50 +02:00
• c5f7cac9db Merge branch 'add_details_extra_activities' into 'master' Sem van der Hoeven 2019-04-03 19:15:46 +00:00
• 19fef1d4c8 FIX::resolved merge conflict and this fixed the issue where it wouldn't set the children of the extra pane Sem van der Hoeven 2019-04-03 19:11:51 +00:00
• 28f9f72f07 UPDATE:: achievement things, tests/checkstyle and it actually works now mlwauben 2019-04-03 20:34:04 +02:00
• f5250aa2a0 Merge branch 'Feature/hints' into 'master' Merel Steenbergen 2019-04-03 18:08:09 +00:00
• d5af8816e9 ADD::added extra activities section to calculator Sem van der Hoeven 2019-04-03 19:32:40 +02:00
• 6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' Merel Steenbergen 2019-04-03 14:29:36 +00:00
• 01e03782c2 Remove addFriend part from removeFriendTest from UserControllerTest.java Merel Steenbergen 2019-04-03 13:40:53 +00:00
• bb6d887036 Added class Hints, including tests Merel Steenbergen 2019-04-03 15:33:26 +02:00
• 7b6457b286 ADD::RemoveFriend method and test in server.userController Merel Steenbergen 2019-04-03 14:19:30 +02:00
• 54d0537f95 EDIT::changed miles to kilometres in calculator Sem van der Hoeven 2019-04-03 11:52:03 +02:00
• b781727703 Delete suppression.xml Ceren Ugurlu 2019-04-01 17:54:41 +00:00
• 4c50eea99a Add meeting notes for week 8 cugurlu 2019-04-01 19:54:09 +02:00
• a38cd45e2a Merge branch 'add_weekly_reports' into 'master' Ceren Ugurlu 2019-04-01 17:12:52 +00:00
• e48264a667 EDIT:: Uncomment build.gradle mainClassName Merel Steenbergen 2019-04-01 16:53:16 +02:00
• 12b05f3b73 ADD:: RemoveFriend method and test in client.userService Merel Steenbergen 2019-04-01 16:46:01 +02:00
• 6d37b99c14 ADD:: RemoveFriend method and tests in Server.UserService Merel Steenbergen 2019-04-01 16:43:10 +02:00
• 52291ac10f ADD:: Friend remove methods and tests in server.User Merel Steenbergen 2019-04-01 16:36:12 +02:00
• ae5d4a1496 Add coverage and checkstyle reports cugurlu 2019-04-01 14:22:31 +02:00
• d7454345be Delete 20190401_checkstyle.png Ceren Ugurlu 2019-04-01 12:19:37 +00:00
• 26693e8782 Merge branch 'add_savedCO2_property' into 'master' v0.2 Ceren Ugurlu 2019-04-01 12:14:42 +00:00
• e78be7ac9f Add co2 saved property tables and tests cugurlu 2019-04-01 13:59:54 +02:00