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

Commit Graph

  • c61469476b Uncommented mainClassName Merel Steenbergen 2019-03-26 11:37:47 +01:00
  • 8677ac94ef FIX:: checkstyle 'client' mlwauben 2019-03-26 11:34:53 +01:00
  • f11cfc804b Add test for leaderboard JSON Merel Steenbergen 2019-03-26 11:31:41 +01:00
  • f39aef31d0 Fix checkstyle errors Merel Steenbergen 2019-03-26 11:24:10 +01:00
  • 4a6d4c7043 Friend list to JSON method added Merel Steenbergen 2019-03-26 11:07:04 +01:00
  • bd21e30f26 FIX:: checkstyle 'client' tests mlwauben 2019-03-26 11:00:24 +01:00
  • cc9f8196bc Added tests and method to make sure you cannot add yourself as a friend Merel Steenbergen 2019-03-26 10:56:45 +01:00
  • 9e345ee353 FIX:: checkstyle fixes mlwauben 2019-03-26 10:55:12 +01:00
  • 7a4a031b1d Added some tests for friend methods Merel Steenbergen 2019-03-26 10:47:12 +01:00
  • ba5e261c7f Resolve merge conflicts Merel Steenbergen 2019-03-26 10:28:57 +01:00
  • 471d41a600 Commit small changes before rebase Merel Steenbergen 2019-03-26 10:24:21 +01:00
  • a1ba2f1d7d FIX: Create-drop databse. Add ManyToMany annotation Merel Steenbergen 2019-03-25 14:37:45 +01:00
  • 28cd0d0d7f FIX: Database fix Merel Steenbergen 2019-03-23 18:26:01 +01:00
  • 437267dcb9 Commit small changes before rebase Merel Steenbergen 2019-03-26 10:24:21 +01:00
  • 559885e22b Upload notes 25-03-2019 Merel Steenbergen 2019-03-26 09:16:26 +00:00
  • d8ced45a67 FIX:: checkstyle server user tests mlwauben 2019-03-26 09:59:00 +01:00
  • 72cb770861 FIX:: checkstyle 'server', things with user mlwauben 2019-03-26 09:49:27 +01:00
  • 0ae5e7f4ee FIX:: checkstyle 'common' mlwauben 2019-03-26 08:46:54 +01:00
  • 4200ae587d FIX:: CI mlwauben 2019-03-26 08:26:40 +01:00
  • f28a4ea924 FIX:: application classes server+client mlwauben 2019-03-26 08:25:09 +01:00
  • ec37bdcd79 Update build.gradle Mika Wauben 2019-03-26 07:05:10 +00:00
  • 7a11e6260e EDIT::Update README.md Sem van der Hoeven 2019-03-25 15:52:52 +00:00
  • b0cdd9bff7 EDIT::Update 20190325_agenda.md Sem van der Hoeven 2019-03-25 15:34:47 +00:00
  • 698c6ef7fd Delete Daan from README Merel Steenbergen 2019-03-25 15:28:53 +00:00
  • 4be4853685 Delete corequadrant-KP.png Merel Steenbergen 2019-03-25 15:27:36 +00:00
  • 36c67ce217 Delete KristinPeneva.jpg Merel Steenbergen 2019-03-25 15:27:20 +00:00
  • cb15a1fefe Delete Daan_Sneep_PDP_Core_Quadrant.PNG Merel Steenbergen 2019-03-25 15:27:11 +00:00
  • 19f4a73119 Delete Daan_Sneep.png Merel Steenbergen 2019-03-25 15:27:00 +00:00
  • 71fc659c79 ADD::added javadoc comments to calculatorController class Sem van der Hoeven 2019-03-25 16:25:13 +01:00
  • 4cb256a30a FIX::deleted onAction of 'addVeganMeal' button, as this method was deleted Sem van der Hoeven 2019-03-25 15:58:34 +01:00
  • 521426ac16 ADD::added style to some buttons Sem van der Hoeven 2019-03-25 15:45:31 +01:00
  • 987acbad71 ADD::added calculator window to GUI Sem van der Hoeven 2019-03-25 14:51:25 +01:00
  • 2e745e690c Merge branch 'createCalculator' into 'master' Ceren Ugurlu 2019-03-25 13:40:13 +00:00
  • 1cec006178 FIX: Create-drop databse. Add ManyToMany annotation Merel Steenbergen 2019-03-25 14:37:45 +01:00
  • cf0952c7c2 Upload coverage report cugurlu 2019-03-25 13:54:18 +01:00
  • b0d69bfc2c Upload checkstyle report cugurlu 2019-03-25 13:52:25 +01:00
  • 006cf60d17 Delete ActivityDto.java Ceren Ugurlu 2019-03-25 12:37:49 +00:00
  • baf516e989 Delete ActivityDtoTest.java Ceren Ugurlu 2019-03-25 12:36:42 +00:00
  • 5c9c1b8be5 Delete Activity.java Ceren Ugurlu 2019-03-25 12:36:12 +00:00
  • d7dcd95278 Delete ActivityTest.java Ceren Ugurlu 2019-03-25 12:34:54 +00:00
  • fc7e718b21 Add new tests cugurlu 2019-03-25 13:33:38 +01:00
  • 8e58118ac7 Add new classes for calculator cugurlu 2019-03-25 13:32:01 +01:00
  • 99143a8f20 Fix error cugurlu 2019-03-25 13:30:25 +01:00
  • 34e010f62d Fix client errors cugurlu 2019-03-25 13:18:48 +01:00
  • e8108498ad Update UserDto and delete addVeganMealProperty cugurlu 2019-03-25 13:07:03 +01:00
  • e79d050b12 Update UserDto in Common cugurlu 2019-03-25 13:03:06 +01:00
  • b9fb7d81ce Merge branch 'updateDoc' into 'master' Ceren Ugurlu 2019-03-25 09:22:36 +00:00
  • 563ae51408 ADD:: review sprint4 Mika Wauben 2019-03-25 09:17:58 +00:00
  • caa86f446d ADD:: notes week6 Mika Wauben 2019-03-25 09:06:52 +00:00
  • ce669b47d2 ADD:: backlog sprint5 Mika Wauben 2019-03-25 09:04:16 +00:00
  • 97d2a0f6fc Add new directory Mika Wauben 2019-03-25 09:03:54 +00:00
  • 2dce37222d ADD:: retrospective sprint4 Mika Wauben 2019-03-25 09:03:37 +00:00
  • a973ab0750 ADD:: scrum board sprint4 Mika Wauben 2019-03-25 09:03:08 +00:00
  • ae3ab8f563 FIX:: folder names were wrong mlwauben 2019-03-25 10:02:11 +01:00
  • d5319fc973 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-24 12:11:38 +01:00
  • 566af39b0d ADD::added Agenda for next meetinf (25-03-2019) Sem van der Hoeven 2019-03-24 12:10:58 +01:00
  • eb3326481a Merge branch 'Add_friends_to_GUI' into 'master' Ceren Ugurlu 2019-03-24 11:05:11 +00:00
  • b3d4f573f8 ADD::added table to friends pane Sem van der Hoeven 2019-03-24 12:01:34 +01:00
  • e494b5294d Revert "Merge branch 'AddFriends' into 'master'" Merel Steenbergen 2019-03-23 17:31:00 +00:00
  • 18c3ce0c92 FIX: Database fix Merel Steenbergen 2019-03-23 18:26:01 +01:00
  • 5b3896d310 Merge branch 'AddFriends' into 'master' Mika Wauben 2019-03-23 12:09:33 +00:00
  • f8315700d9 FIX: Uncomment mainClassName Merel Steenbergen 2019-03-22 21:57:05 +01:00
  • 6385beec06 FIX: Tests now work Merel Steenbergen 2019-03-22 21:51:09 +01:00
  • 12c2ebab4e Debugging in progress. FindByName returns null again. Merel Steenbergen 2019-03-22 20:20:39 +01:00
  • e69e08ad15 EDIT: Try to fix server, again Merel Steenbergen 2019-03-22 18:44:59 +01:00
  • ae000baba4 EDIT:::edited .gitignore Sem van der Hoeven 2019-03-22 09:25:48 +01:00
  • caf9e3e1d9 Merge branch 'cleanUp_files' into 'master' Sem van der Hoeven 2019-03-22 07:41:37 +00:00
  • bddf984438 Clean up all unnecessary files cugurlu 2019-03-21 18:07:14 +01:00
  • 6323fd06eb FIX: Bug fixed, Server now works again Merel Steenbergen 2019-03-21 16:14:50 +01:00
  • fb69ec280d Added testing for the friend list and equals in User class in Server Merel Steenbergen 2019-03-21 16:09:23 +01:00
  • dfdbc8d5a9 ADD::added friends pane and button to dashboard Sem van der Hoeven 2019-03-21 10:45:54 +01:00
  • b3a0ddaa68 Retry adding friends. Server down again Merel Steenbergen 2019-03-20 15:44:47 +01:00
  • 93aaf19f13 DEBUG/FIX::fixed bug where total amount of vegetarian meals wouldn't update Sem van der Hoeven 2019-03-20 13:15:12 +01:00
  • 8345b6c06f ADD::Added slide-in transition for the menu bar Sem van der Hoeven 2019-03-20 08:08:32 +01:00
  • 292035498c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-19 14:52:19 +01:00
  • 1f78805f9b EDIT::Changed Login screen name from Go Green to Greenify Sem van der Hoeven 2019-03-19 14:49:47 +01:00
  • 9d38e1e541 Merge branch 'fixMaster' into 'master' Sem van der Hoeven 2019-03-19 13:48:39 +00:00
  • 121b86a73e Merge branch 'master' into 'fixMaster' Ceren Ugurlu 2019-03-19 13:09:13 +00:00
  • 920c7c798d ADD::added more comments Sem van der Hoeven 2019-03-18 20:47:34 +01:00
  • 2c54b8d68c Merge branch 'AddComments' into 'master' Ceren Ugurlu 2019-03-18 16:14:49 +00:00
  • 0ed8dc34ab Delete .project Ceren Ugurlu 2019-03-18 16:10:19 +00:00
  • b8f4415825 ADD::added comments to most classes to make it more understandable Sem van der Hoeven 2019-03-18 17:07:38 +01:00
  • 2e244e600f Delete OOPP.kotlin_module Ceren Ugurlu 2019-03-18 15:58:27 +00:00
  • 32b0554329 Delete .classpath Ceren Ugurlu 2019-03-18 15:58:06 +00:00
  • 4f089d8408 Delete CSE1105.checkstyle.xml Ceren Ugurlu 2019-03-18 15:57:47 +00:00
  • 563c72ffec Update branch cugurlu 2019-03-18 16:56:44 +01:00
  • ecdc9f3a4f ADD::Added hover effects Sem van der Hoeven 2019-03-18 15:48:10 +01:00
  • 2c32b7d65b Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template Sem van der Hoeven 2019-03-18 15:31:41 +01:00
  • 8dd8ae28d4 ADD::added animations Sem van der Hoeven 2019-03-18 15:30:55 +01:00
  • 68036b3c2f Update coverage report cugurlu 2019-03-18 15:27:05 +01:00
  • 6a71823885 ADD::added stylesheet for login window Sem van der Hoeven 2019-03-18 14:43:15 +01:00
  • baa681833e Merge branch 'Add_report' into 'master' Sem van der Hoeven 2019-03-18 13:40:02 +00:00
  • 166945871d Fix UserService and UserServiceTest cugurlu 2019-03-18 14:35:30 +01:00
  • 17d5591146 Add coverage report cugurlu 2019-03-18 14:17:22 +01:00
  • 874c6fba06 ADD::added title to main program stage v0.1.1 Sem van der Hoeven 2019-03-18 13:34:34 +01:00
  • f89470458b Merge branch 'add_veganMealCounter' into 'master' Ceren Ugurlu 2019-03-18 12:16:32 +00:00
  • 318900b203 Merge branch 'master' into 'add_veganMealCounter' Ceren Ugurlu 2019-03-18 12:14:04 +00:00
  • 584e5bf90c Update GUI cugurlu 2019-03-18 13:06:04 +01:00
  • 436343d170 Merge branch 'updateDoc' into 'master' Mika Wauben 2019-03-18 11:46:30 +00:00
  • 4863ae4d3f Merge branch 'updateDoc' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into updateDoc mlwauben 2019-03-18 12:43:14 +01:00