sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
411 Commits 4 Branches 6 Tags
e755107fa86656b76c520e33d3c65a2724ed5314
Commit Graph

151 Commits

Author SHA1 Message Date
mlwauben
e755107fa8 FIX:: checkstyle fixes 2019-03-26 15:48:50 +01:00
mlwauben
37d3e6c4a7 FIX:: checkstyle 'client' 2019-03-26 15:40:43 +01:00
mlwauben
81f58c86f9 FIX:: checkstyle 'client' tests 2019-03-26 15:39:15 +01:00
mlwauben
0bf32dc19c FIX:: checkstyle fixes 2019-03-26 15:39:15 +01:00
mlwauben
8ec3a508eb FIX:: checkstyle server user tests 2019-03-26 15:39:15 +01:00
mlwauben
71ea1e3a4b FIX:: checkstyle 'server', things with user 2019-03-26 15:38:43 +01:00
mlwauben
61e31df157 FIX:: checkstyle 'common' 2019-03-26 15:34:50 +01:00
mlwauben
97a0e38c40 FIX:: application classes server+client 2019-03-26 15:34:50 +01:00
Merel Steenbergen
90bf334c19 Merge branch 'AddFriends' into 'master' 
Add methods and tests for friends.

See merge request cse1105/2018-2019/oopp-group-43/template!43
 2019-03-26 14:29:14 +00:00
Sem van der Hoeven
bc6e8cd89d Merge branch 'master' into 'Add_Calculator_to_GUI' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/resources/fxml/dashboard.fxml

the conflicts were only empty lines on the master
 2019-03-26 14:04:49 +00:00
Merel Steenbergen
4780ae7b11 Revert changes: AssertArrayEquals doesn't work on ArrayLists 2019-03-26 13:56:48 +00:00
Merel Steenbergen
b1f3725f71 Change wrong url (setInput to addFriend) on Client userService 2019-03-26 13:52:13 +00:00
Merel Steenbergen
1668731624 Use assertArrayEquals instead of AssertEquals 2019-03-26 13:49:29 +00:00
Merel Steenbergen
4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
Merel Steenbergen
f11cfc804b Add test for leaderboard JSON 2019-03-26 11:31:41 +01:00
Merel Steenbergen
f39aef31d0 Fix checkstyle errors 2019-03-26 11:24:10 +01:00
Merel Steenbergen
4a6d4c7043 Friend list to JSON method added 2019-03-26 11:07:04 +01:00
Merel Steenbergen
cc9f8196bc Added tests and method to make sure you cannot add yourself as a friend 2019-03-26 10:56:45 +01:00
Merel Steenbergen
7a4a031b1d Added some tests for friend methods 2019-03-26 10:47:12 +01:00
Merel Steenbergen
471d41a600 Commit small changes before rebase 2019-03-26 10:26:29 +01:00
Merel Steenbergen
a1ba2f1d7d FIX: Create-drop databse. Add ManyToMany annotation 2019-03-26 10:26:29 +01:00
Sem van der Hoeven
71fc659c79 ADD::added javadoc comments to calculatorController class 2019-03-25 16:25:13 +01:00
Sem van der Hoeven
4cb256a30a FIX::deleted onAction of 'addVeganMeal' button, as this method was deleted 2019-03-25 15:58:34 +01:00
Sem van der Hoeven
521426ac16 ADD::added style to some buttons 
EDIT::changed travel pane from anchor pane to scroll pane
 2019-03-25 15:45:31 +01:00
Sem van der Hoeven
987acbad71 ADD::added calculator window to GUI 
ADD::added button to open calculator to main window
 2019-03-25 14:51:25 +01:00
Ceren Ugurlu
006cf60d17 Delete ActivityDto.java 2019-03-25 12:37:49 +00:00
Ceren Ugurlu
baf516e989 Delete ActivityDtoTest.java 2019-03-25 12:36:42 +00:00
Ceren Ugurlu
5c9c1b8be5 Delete Activity.java 2019-03-25 12:36:12 +00:00
Ceren Ugurlu
d7dcd95278 Delete ActivityTest.java 2019-03-25 12:34:54 +00:00
cugurlu
fc7e718b21 Add new tests 2019-03-25 13:33:38 +01:00
cugurlu
8e58118ac7 Add new classes for calculator 2019-03-25 13:32:01 +01:00
cugurlu
99143a8f20 Fix error 2019-03-25 13:30:25 +01:00
cugurlu
34e010f62d Fix client errors 2019-03-25 13:18:48 +01:00
cugurlu
e8108498ad Update UserDto and delete addVeganMealProperty 2019-03-25 13:07:03 +01:00
cugurlu
e79d050b12 Update UserDto in Common 2019-03-25 13:03:06 +01:00
Ceren Ugurlu
eb3326481a Merge branch 'Add_friends_to_GUI' into 'master' 
merge Add_friends_to_gui into master

See merge request cse1105/2018-2019/oopp-group-43/template!39
 2019-03-24 11:05:11 +00:00
Sem van der Hoeven
b3d4f573f8 ADD::added table to friends pane 2019-03-24 12:01:34 +01:00
Merel Steenbergen
e494b5294d Revert "Merge branch 'AddFriends' into 'master'" 
This reverts merge request !37
 2019-03-23 17:31:00 +00:00
Mika Wauben
5b3896d310 Merge branch 'AddFriends' into 'master' 
Add basic friends

See merge request cse1105/2018-2019/oopp-group-43/template!37
 2019-03-23 12:09:33 +00:00
Merel Steenbergen
6385beec06 FIX: Tests now work 2019-03-22 21:51:09 +01:00
Merel Steenbergen
12c2ebab4e Debugging in progress. FindByName returns null again. 2019-03-22 20:20:39 +01:00
Merel Steenbergen
e69e08ad15 EDIT: Try to fix server, again 2019-03-22 18:44:59 +01:00
cugurlu
bddf984438 Clean up all unnecessary files 2019-03-21 18:07:14 +01:00
Merel Steenbergen
6323fd06eb FIX: Bug fixed, Server now works again 2019-03-21 16:14:50 +01:00
Merel Steenbergen
fb69ec280d Added testing for the friend list and equals in User class in Server 2019-03-21 16:09:23 +01:00
Sem van der Hoeven
dfdbc8d5a9 ADD::added friends pane and button to dashboard 
ADD::added load animations to register window
 2019-03-21 10:45:54 +01:00
Merel Steenbergen
b3a0ddaa68 Retry adding friends. Server down again 2019-03-20 15:44:47 +01:00
Sem van der Hoeven
93aaf19f13 DEBUG/FIX::fixed bug where total amount of vegetarian meals wouldn't update 
fixed the bug where totalVeganMeals wouldn't update on clicking the activities button if you were already on the activities screen

ADD::added id to 'add activity' button on dashboard

for adding a color change when clicking it, still need to implement it completely
 2019-03-20 13:15:12 +01:00
Sem van der Hoeven
8345b6c06f ADD::Added slide-in transition for the menu bar 
it gets played on load, right now it sometimes is a bit laggy but not sure if that is JavaFX or just everything getting loaded
 2019-03-20 08:08:32 +01:00
Sem van der Hoeven
292035498c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
SourceTree needed to merge this?
 2019-03-19 14:52:19 +01:00