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

• a25c5da5ac Merge branch 'add/final_report_draft' into 'master' Merel Steenbergen 2019-04-01 11:59:32 +00:00
• 5ab7deb210 Rename the draft final report Merel Steenbergen 2019-04-01 11:57:52 +00:00
• 9ad503db0d ADD: Right version of the draft of the final report Merel Steenbergen 2019-04-01 13:51:24 +02:00
• 5a412cd170 Merge branch 'fix/checkstyle' into 'master' Mika Wauben 2019-04-01 11:38:24 +00:00
• 644f466696 Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle Mika Wauben 2019-04-01 11:38:23 +00:00
• 118ae797f5 Upload draft of the final report Merel Steenbergen 2019-04-01 11:37:02 +00:00
• fcaf3ddb49 Merge branch 'update/doc' into 'master' Mika Wauben 2019-03-31 17:45:31 +00:00
• 8f026a960e UPDATE:: readme, wow 4 commits for one file Mika Wauben 2019-03-31 17:31:28 +00:00
• b8bb8dc91c UPDATE:: readme, slowly getting there Mika Wauben 2019-03-31 17:30:09 +00:00
• d824a3b819 EDIT::changed activities textfields to labels Sem van der Hoeven 2019-03-31 19:28:29 +02:00
• a5dd8667b9 UPDATE:: readme because I am an idiot and didn't save my file yet ... Mika Wauben 2019-03-31 17:27:56 +00:00
• 947ae660a0 UPDATE:: readme (start of the great readme) Mika Wauben 2019-03-31 17:26:58 +00:00
• c85432fb48 ADD:: agenda week8 Mika Wauben 2019-03-31 16:57:50 +00:00
• f133e80ce3 Add new directory Mika Wauben 2019-03-31 16:57:31 +00:00
• 97577cfd1c ADD:: backlog sprint6 Mika Wauben 2019-03-31 16:57:01 +00:00
• 0cfead72af Add new directory Mika Wauben 2019-03-31 16:56:39 +00:00
• c3124f509e ADD:: scrumboard sprint5 Mika Wauben 2019-03-31 16:56:24 +00:00
• d484898ba1 ADD:: retrospective sprint5 Mika Wauben 2019-03-31 16:54:52 +00:00
• bd225edea1 ADD:: review sprint5 Mika Wauben 2019-03-31 16:54:10 +00:00
• 608d3ec40f Merge branch 'addActivitySummary_newTests' into 'master' Ceren Ugurlu 2019-03-31 14:12:44 +00:00
• c8b9b4d78f Solve the conflict Ceren Ugurlu 2019-03-31 13:36:21 +00:00
• a9f63f6fab Merge branch 'Add_extras_to_calculator' into 'master' Sem van der Hoeven 2019-03-31 13:31:08 +00:00
• 3f4e7cb9a9 Update README.md Ceren Ugurlu 2019-03-31 13:28:42 +00:00
• 9f3597124d EDIT::edited back javafx imports for checkstyle Sem van der Hoeven 2019-03-31 15:28:08 +02:00
• f4f79484fa Test all new methods cugurlu 2019-03-31 15:27:07 +02:00
• 3b4add03ee Add new activity page properties cugurlu 2019-03-31 15:26:48 +02:00
• 32c9713835 Add acitivitySummary to GUI cugurlu 2019-03-31 15:26:06 +02:00
• 8e11ecbcf4 Add new methods for getInputMap from database cugurlu 2019-03-31 15:25:40 +02:00
• 9f45b1c8ac Merge branch 'Add_extras_to_calculator' into 'master' Ceren Ugurlu 2019-03-31 13:19:54 +00:00
• c03538ff34 ADD::added section indicator bars to calculator Sem van der Hoeven 2019-03-31 14:41:19 +02:00
• 7805122c06 ADD::added 'extra' section to calculator Sem van der Hoeven 2019-03-31 14:26:05 +02:00
• 61ed9fc497 Merge branch 'fixBugs_addLeaderboard' into 'master' Ceren Ugurlu 2019-03-31 11:07:47 +00:00
• 85412af2a6 ADD::added style to friends table Sem van der Hoeven 2019-03-31 12:41:45 +02:00
• 5449c664bd Update README.md cugurlu 2019-03-31 00:54:50 +01:00
• b4a00fade2 Add new tests cugurlu 2019-03-31 00:51:55 +01:00
• cf1704e872 Connect server and client for getAllUsers, saveFootprint and getFootprint methods cugurlu 2019-03-31 00:51:34 +01:00
• 383d505f52 Fix checkstyle errors and delete unused methods for high coverage cugurlu 2019-03-31 00:50:21 +01:00
• cc236c46b6 Add tests for userService cugurlu 2019-03-31 00:49:16 +01:00
• ed695f941d Add leaderboard and fix friend bugs cugurlu 2019-03-31 00:47:21 +01:00
• a41b697510 Fix calculator bugs cugurlu 2019-03-31 00:45:50 +01:00
• ebaeff9fad EDIT::changed colour scheme of 'add friend' button Sem van der Hoeven 2019-03-30 19:29:49 +01:00
• 973e8aba69 UPDATE:: checkstyle fixes mlwauben 2019-03-30 17:16:24 +01:00
• 7656b60fcf UPDATE:: achievements and tests mlwauben 2019-03-30 16:43:24 +01:00
• 1437bbc1bc Merge branch 'connect_friends_GUI' into 'master' Ceren Ugurlu 2019-03-30 10:58:18 +00:00
• ca11cd3c9a DEBUG:: achievement things (tests all work now) mlwauben 2019-03-30 11:29:39 +01:00
• 0b2677fd06 ADD:added section indicators to calculator Sem van der Hoeven 2019-03-30 11:18:50 +01:00
• 336e56bb51 ADD:: added section indicator bars to calculator Sem van der Hoeven 2019-03-30 11:17:12 +01:00
• 026cd15009 Update DashBoardController.java Ceren Ugurlu 2019-03-30 09:36:41 +00:00
• f5d9bd5010 UPDATE:: added achievements to user class mlwauben 2019-03-30 09:25:12 +01:00
• 3d61cd061a ADD:: class of achievements list mlwauben 2019-03-30 09:02:02 +01:00
• 393bfc9445 ADD:: achievement class mlwauben 2019-03-30 08:23:54 +01:00
• a64b31001a Edit dashboard for new properties cugurlu 2019-03-29 18:11:39 +01:00
• 704854e8b5 Add new controller friends cugurlu 2019-03-29 18:11:16 +01:00
• 25c8951530 Add fxml file for add friend page cugurlu 2019-03-29 18:10:55 +01:00
• e41f434a28 Add new class for tableView cugurlu 2019-03-29 18:10:01 +01:00
• 0530fc4ddb Add new icons cugurlu 2019-03-29 18:09:31 +01:00
• 36f36d4100 Merge branch 'connect_calculator&GUI' into 'master' Ceren Ugurlu 2019-03-29 13:17:15 +00:00
• d0beb236ea Edit to connect calculator with GUI cugurlu 2019-03-29 12:47:24 +01:00
• c62e4719ea ADD:: test fxml+controller mlwauben 2019-03-28 23:11:58 +01:00
• a92a5b6e47 Merge branch 'finish_calculator_GUI' into 'master' Sem van der Hoeven 2019-03-28 21:37:43 +00:00
• 56bd05324c Merge branch 'finish_calculator_GUI' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into finish_calculator_GUI Sem van der Hoeven 2019-03-28 22:35:54 +01:00
• fcea76f0e9 FIX::fixed checkstyle import error Sem van der Hoeven 2019-03-28 22:34:54 +01:00
• 6fd04b1d0a EDiT:: resolved merge conflicts, most were just empty lines in master Sem van der Hoeven 2019-03-28 19:44:01 +00:00
• 6ab7141f64 ADD::finished GUI for calculator Sem van der Hoeven 2019-03-28 14:09:36 +01:00
• 980e64657a EDIT::finished home section of calculator Sem van der Hoeven 2019-03-27 20:51:14 +01:00
• 7267a73cbe Merge branch 'develop_calculator' into 'master' Ceren Ugurlu 2019-03-27 13:35:10 +00:00
• c9178362cc Update CalculatorServiceTest .java cugurlu 2019-03-27 13:47:00 +01:00
• 42cf5a5ee4 Add new tests to increase coverage cugurlu 2019-03-27 13:46:23 +01:00
• 56829cca6b Add new methods and tests for requesting cugurlu 2019-03-27 13:45:28 +01:00
• e51ef99bc9 Edit for saving setted new inputs and calculated footprint cugurlu 2019-03-27 13:44:24 +01:00
• 4a31b52e69 Update InputValidator and its test for API cugurlu 2019-03-27 13:42:34 +01:00
• 20c37c4899 Add tests for footprint cugurlu 2019-03-27 13:41:32 +01:00
• 07f5eb0449 Add methods for calculator and fix checktsyle errors cugurlu 2019-03-27 13:40:52 +01:00
• 3dec44ada1 EDIT::Finished Travel GUI section of calculator Sem van der Hoeven 2019-03-27 13:10:21 +01:00
• 1d10d1d54b ADD::almost completed travel pane of calculator Sem van der Hoeven 2019-03-27 09:44:34 +01:00
• 1f03552d84 Merge branch 'fix/checkstyleAndComments' into 'master' Merel Steenbergen 2019-03-26 15:06:24 +00:00
• 2abad808ad FIX: Checkstyle fixes after merge conflicts Merel Steenbergen 2019-03-26 16:01:53 +01:00
• a540b9e8f2 Resolve merge requests Merel Steenbergen 2019-03-26 15:50:11 +01:00
• 08d46ea8f0 DELETE:: not used imports mlwauben 2019-03-26 15:21:23 +01:00
• e755107fa8 FIX:: checkstyle fixes mlwauben 2019-03-26 11:55:05 +01:00
• 37d3e6c4a7 FIX:: checkstyle 'client' mlwauben 2019-03-26 11:34:53 +01:00
• 81f58c86f9 FIX:: checkstyle 'client' tests mlwauben 2019-03-26 11:00:24 +01:00
• 0bf32dc19c FIX:: checkstyle fixes mlwauben 2019-03-26 10:55:12 +01:00
• 8ec3a508eb FIX:: checkstyle server user tests mlwauben 2019-03-26 09:59:00 +01:00
• 71ea1e3a4b FIX:: checkstyle 'server', things with user mlwauben 2019-03-26 09:49:27 +01:00
• 61e31df157 FIX:: checkstyle 'common' mlwauben 2019-03-26 08:46:54 +01:00
• 064e8e04c2 FIX:: CI mlwauben 2019-03-26 08:26:40 +01:00
• 97a0e38c40 FIX:: application classes server+client mlwauben 2019-03-26 08:25:09 +01:00
• 0751f50026 Update build.gradle Mika Wauben 2019-03-26 07:05:10 +00:00
• 470a31889a Resolved the conflicts. We should check if the JavaDoc is still in the right place, because it looked a little weird while resolving the conflicts Merge branch 'master' into 'fix/checkstyleAndComments' Merel Steenbergen 2019-03-26 14:33:05 +00:00
• 90bf334c19 Merge branch 'AddFriends' into 'master' Merel Steenbergen 2019-03-26 14:29:14 +00:00
• 12e677607d Merge branch 'Add_Calculator_to_GUI' into 'master' Merel Steenbergen 2019-03-26 14:27:23 +00:00
• c6ff4862e6 DELETE:: not used imports mlwauben 2019-03-26 15:21:23 +01:00
• bc6e8cd89d Merge branch 'master' into 'Add_Calculator_to_GUI' Sem van der Hoeven 2019-03-26 14:04:49 +00:00
• 4780ae7b11 Revert changes: AssertArrayEquals doesn't work on ArrayLists Merel Steenbergen 2019-03-26 13:56:48 +00:00
• b1f3725f71 Change wrong url (setInput to addFriend) on Client userService Merel Steenbergen 2019-03-26 13:52:13 +00:00
• 1668731624 Use assertArrayEquals instead of AssertEquals Merel Steenbergen 2019-03-26 13:49:29 +00:00
• d6640966c5 Merge branch 'AddDocs' into 'master' Merel Steenbergen 2019-03-26 10:55:53 +00:00
• cf96ac30b8 FIX:: checkstyle fixes mlwauben 2019-03-26 11:55:05 +01:00
• 4171b933dc FIX: Spelling error Merel Steenbergen 2019-03-26 11:40:24 +01:00