sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • dfb65131e2 Merge branch 'Test/common' into 'master' master Merel Steenbergen 2019-04-15 12:40:21 +00:00
  • 6faa5edd57 FIX::Checkstyle error.java Merel Steenbergen 2019-04-15 12:38:57 +00:00
  • 2f2a9ba9fc Replace coverage report Ceren Ugurlu 2019-04-15 12:34:30 +00:00
  • 533a5e9631 Merge branch 'Update/readme' into 'master' v1.0.0 Mika Wauben 2019-04-15 12:27:04 +00:00
  • f31449508e ADD::Package for features to make test coverage clearer Merel Steenbergen 2019-04-15 14:24:20 +02:00
  • b266160e93 ADD::added animations to buttons on friends pane Sem van der Hoeven 2019-04-15 14:17:22 +02:00
  • a44907865c ADD:: Test for ApplicationException. Merel Steenbergen 2019-04-15 14:16:18 +02:00
  • 2f1d07f008 UPDATE:: screenshots and 'getting started' Mika Wauben 2019-04-15 12:05:02 +00:00
  • af65142bf4 FIX::typo in extra activities Sem van der Hoeven 2019-04-15 14:01:23 +02:00
  • e2be018816 FIX:: explanation button mlwauben 2019-04-15 11:18:19 +02:00
  • 36fbcfedb8 ADD:: javadoc mlwauben 2019-04-15 11:11:03 +02:00
  • 2b985344dc ADD::added button to display/hide explanation Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-04-15 10:57:34 +02:00
  • c030bf3a8e ADD::added button to display/hide explanation Sem van der Hoeven 2019-04-15 10:56:50 +02:00
  • 8150537aa5 Merge branch 'Add/docLastSprint' into 'master' Mika Wauben 2019-04-15 08:53:08 +00:00
  • 694d58924c ADD:: doc sprint7 Mika Wauben 2019-04-15 08:53:08 +00:00
  • 2ed6192090 Merge branch 'add_checkstyle_coverage' into 'master' Mika Wauben 2019-04-15 08:18:56 +00:00
  • 5ef716330c Upload weekly reports cugurlu 2019-04-15 08:59:48 +02:00
  • facebc1334 Merge branch 'Fix/LastCheckstyles' into 'master' Mika Wauben 2019-04-15 05:44:50 +00:00
  • 84793dc924 FIX:: checkstyle error button and missing javadoc Mika Wauben 2019-04-15 05:44:49 +00:00
  • dd184a1398 Update build.gradle Ceren Ugurlu 2019-04-14 16:42:57 +00:00
  • b959484185 Merge branch 'hashPassword' into 'master' Ceren Ugurlu 2019-04-14 16:37:56 +00:00
  • 69d80b1f7c Update build.gradle Ceren Ugurlu 2019-04-14 16:30:36 +00:00
  • f8799c06fb Add new plugins for heroku cugurlu 2019-04-14 18:28:29 +02:00
  • f20f010cb8 Remove unnecessary prints cugurlu 2019-04-14 18:28:04 +02:00
  • 048253a9d3 Add password hashing cugurlu 2019-04-14 18:27:37 +02:00
  • 8d029fe21c Fix removeFriend image cugurlu 2019-04-14 18:26:54 +02:00
  • 60f8b2a9d9 Merge branch 'Update/leaderBoards' into 'master' Mika Wauben 2019-04-13 10:38:58 +00:00
  • 66c2b44be6 Merge branch 'master' into 'Update/leaderBoards' Mika Wauben 2019-04-13 10:38:58 +00:00
  • f0d6b04e30 Merge branch 'removeFriend' into 'master' Ceren Ugurlu 2019-04-11 16:43:59 +00:00
  • 6084338525 Fix checkstyle errors cugurlu 2019-04-11 14:24:07 +02:00
  • 9006588eed Add new methods to controllers to remove a friend cugurlu 2019-04-11 14:23:40 +02:00
  • 367daa1eff Edit dashboard.fxml cugurlu 2019-04-11 14:22:58 +02:00
  • a2af22facb Add fxml file and image for removeFriend property cugurlu 2019-04-11 14:22:41 +02:00
  • abdaa14679 Fix small problem in AchievementService cugurlu 2019-04-11 14:22:13 +02:00
  • 8c5f177704 Merge branch 'Add/docs' into 'master' Merel Steenbergen 2019-04-11 09:53:15 +00:00
  • 00718a1cf2 Update 20190408_agenda Merel Steenbergen 2019-04-11 09:49:29 +00:00
  • e73c419c55 ADD::Agenda for 08-04-2019 that I forgot to upload, sorry. Merel Steenbergen 2019-04-11 09:49:05 +00:00
  • f4cc37a34b Upload final report Merel Steenbergen 2019-04-11 09:45:49 +00:00
  • 461b3bd329 Merge branch 'Feature/explanation' into 'master' Merel Steenbergen 2019-04-10 20:43:41 +00:00
  • 3960efaad8 ADD::added button to display/hide explaination feature/explanation Sem van der Hoeven 2019-04-10 22:07:31 +02:00
  • f56a959720 Merge branch 'add/more_animations' into 'master' Sem van der Hoeven 2019-04-10 19:25:41 +00:00
  • 796deadb8c Merge branch 'Feature/delete_my_account' into 'master' Merel Steenbergen 2019-04-10 14:20:49 +00:00
  • 2b1c6cf780 FIX::Import that gave a CheckStyle error.java Merel Steenbergen 2019-04-10 13:40:39 +00:00
  • eed4f7903d FIX::Small typing error in method name.java Merel Steenbergen 2019-04-10 13:40:08 +00:00
  • 377db10f13 EDIT::changed color of register window button add/more_animations Sem van der Hoeven 2019-04-10 12:24:11 +02:00
  • 50fb2078b0 EDIT::fixed checkstyle import Sem van der Hoeven 2019-04-10 12:22:23 +02:00
  • 123a767a75 ADD::added style to button in register window Sem van der Hoeven 2019-04-10 12:19:31 +02:00
  • e0e6744c95 EDIT::removed lines from background of vegetarian meals achievement picture Sem van der Hoeven 2019-04-10 12:07:07 +02:00
  • cfc238af73 ADD::Added animations to switching panes in extra activities Sem van der Hoeven 2019-04-10 12:04:17 +02:00
  • 78e050751f ADD::added animations to buttons in login and register screen Sem van der Hoeven 2019-04-10 11:49:31 +02:00
  • 81f48ca0b6 FIX::Checkstyle errors Merel Steenbergen 2019-04-09 17:40:26 +02:00
  • d97ae9b53a FIX::Checkstyle error Merel Steenbergen 2019-04-09 17:38:44 +02:00
  • 2a136b6a07 ADD::Client.UserServiceTest Merel Steenbergen 2019-04-09 17:37:51 +02:00
  • 080053765c ADD::server.UserControllerTest Merel Steenbergen 2019-04-09 17:35:39 +02:00
  • 21ab3d5b79 ADD::server.userService Tests Merel Steenbergen 2019-04-09 17:30:58 +02:00
  • 8e747e54be ADD::Clientside method Merel Steenbergen 2019-04-09 17:03:56 +02:00
  • 99899dfc88 Add serverside methods Merel Steenbergen 2019-04-09 17:00:51 +02:00
  • 867eae66f4 ADD::Explanation in first calculator screen Merel Steenbergen 2019-04-09 16:28:17 +02:00
  • 37d43c8247 Merge branch 'Update/activitiesPane' into 'master' Mika Wauben 2019-04-09 13:37:28 +00:00
  • a704522a63 UPDATE:: activities pane (added all extra activities) Mika Wauben 2019-04-09 13:37:28 +00:00
  • cefc4d2b4b Merge branch 'Update/readme' into 'master' v0.2.1 Mika Wauben 2019-04-09 07:30:08 +00:00
  • 222489a316 Update/readme Mika Wauben 2019-04-09 07:30:07 +00:00
  • 4b949db919 Merge branch 'Delete/forgot_password' into 'master' Merel Steenbergen 2019-04-08 14:44:30 +00:00
  • c8cbb25f5d Merge branch 'update/notes_week9' into 'master' Sem van der Hoeven 2019-04-08 14:19:03 +00:00
  • 5653800d47 ADD::Added notes for week 9 update/notes_week9 Sem van der Hoeven 2019-04-08 16:15:44 +02:00
  • c8d5dd99ae DELETE 'forgot password' button Merel Steenbergen 2019-04-08 15:59:23 +02:00
  • 6d7e73586f Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-04-08 15:52:20 +02:00
  • 12ca633461 EDIT::suppressed some duplicate warnings Sem van der Hoeven 2019-04-08 15:51:44 +02:00
  • a715babcd9 ADD::added first part of notes week 9 Sem van der Hoeven 2019-04-08 15:50:08 +02:00
  • 7b6b8ead65 Merge branch 'Feature/more_hints' into 'master' Merel Steenbergen 2019-04-08 13:46:40 +00:00
  • a206625082 Merge branch 'add_piechart' into 'master' Ceren Ugurlu 2019-04-08 13:45:17 +00:00
  • 425550c922 FIX::Uncomment something to make pipeline pass Merel Steenbergen 2019-04-08 15:41:01 +02:00
  • e6ecda5471 FIX::Small merge conflict Merel Steenbergen 2019-04-08 15:39:53 +02:00
  • f6f74cd2aa FIX::Checkstyle errors Merel Steenbergen 2019-04-08 15:38:49 +02:00
  • d03deace57 Add new test methods cugurlu 2019-04-08 15:36:42 +02:00
  • 4dd02649b8 Add methods for getting the results of a user cugurlu 2019-04-08 15:36:21 +02:00
  • 9fd3b1cf5b Add new methods for piechart cugurlu 2019-04-08 15:35:35 +02:00
  • 9fc42247da EDIT::added required values to saving co2 and using bike achievements Sem van der Hoeven 2019-04-08 15:33:18 +02:00
  • fb22937864 FIX::Illegal catch fix: RuntimeException to HttpClientErrorException Merel Steenbergen 2019-04-05 19:34:08 +02:00
  • dc432df120 FIX::More CS errors Merel Steenbergen 2019-04-05 19:20:09 +02:00
  • a6a52688f2 FIX::Checkstyle errors Merel Steenbergen 2019-04-05 19:16:26 +02:00
  • ae7e36f757 ADD::Extra hints Merel Steenbergen 2019-04-05 19:11:51 +02:00
  • 917d3a64bb FIXX:: Checkstyle Merel Steenbergen 2019-04-05 17:08:58 +02:00
  • 92ff0073e8 EDIT::Change some hints and add tests Merel Steenbergen 2019-04-05 17:00:45 +02:00
  • 3cc01e4f4a EDIT::added style to logout button Sem van der Hoeven 2019-04-08 15:02:15 +02:00
  • 7043f7253d Merge branch 'fix/sorting_bugs' into 'master' Ceren Ugurlu 2019-04-08 12:37:57 +00:00
  • 83611c4ecc Merge branch 'add/activity_tooltips' into 'master' Sem van der Hoeven 2019-04-08 12:36:45 +00:00
  • b99b66b87b Fix sorting errors cugurlu 2019-04-08 14:34:38 +02:00
  • 3e7fbeae75 EDIT::Update .gitlab-ci.yml Sem van der Hoeven 2019-04-08 12:27:06 +00:00
  • 839292ad91 EDIT::Update .gitlab-ci.yml Sem van der Hoeven 2019-04-08 12:26:23 +00:00
  • 6ba21c331d FIX::fixed compileJava build failing Sem van der Hoeven 2019-04-08 14:21:20 +02:00
  • 0cda63cacb Merge branch 'add/activity_tooltips' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into add/activity_tooltips Sem van der Hoeven 2019-04-08 14:19:06 +02:00
  • 79fd69503c FIX::fixed complieJava build failing Sem van der Hoeven 2019-04-08 14:17:06 +02:00
  • cbf15d9574 Merge branch 'master' into 'add/activity_tooltips' Sem van der Hoeven 2019-04-08 12:13:44 +00:00
  • 8667f65e33 Merge branch 'update/doc' into 'master' Mika Wauben 2019-04-08 12:07:27 +00:00
  • 544b756e70 Update/doc Mika Wauben 2019-04-08 12:07:27 +00:00
  • 18a0973af4 EDIT::added style to tooltips and reduced delay between hovering over the achievement and the tooltip appearing Sem van der Hoeven 2019-04-08 14:00:21 +02:00
  • 9e37421d6d ADD::added tooltip texts to all achievements Sem van der Hoeven 2019-04-08 13:08:20 +02:00
  • 31def99398 ADD::added buttons to apply tooltips to for the activities Sem van der Hoeven 2019-04-08 12:55:32 +02:00
  • dbe6fc4e33 Delete README.md Ceren Ugurlu 2019-04-08 10:38:36 +00:00