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

401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Merel Steenbergen
12e677607d Merge branch 'Add_Calculator_to_GUI' into 'master' 
merge 'add calculator to gui' to first fix master

See merge request cse1105/2018-2019/oopp-group-43/template!45
 2019-03-26 14:27:23 +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
d6640966c5 Merge branch 'AddDocs' into 'master' 
Add notes

See merge request cse1105/2018-2019/oopp-group-43/template!42
 2019-03-26 10:55:53 +00:00
Merel Steenbergen
4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
Merel Steenbergen
c61469476b Uncommented mainClassName 2019-03-26 11:37:47 +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
ba5e261c7f Resolve merge conflicts 2019-03-26 10:28:57 +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
Merel Steenbergen
28cd0d0d7f FIX: Database fix 2019-03-26 10:24:57 +01:00
Merel Steenbergen
437267dcb9 Commit small changes before rebase 2019-03-26 10:24:21 +01:00
Merel Steenbergen
559885e22b Upload notes 25-03-2019 2019-03-26 09:16:26 +00:00
Sem van der Hoeven
7a11e6260e EDIT::Update README.md 
updated location of pictures
 2019-03-25 15:52:52 +00:00
Sem van der Hoeven
b0cdd9bff7 EDIT::Update 20190325_agenda.md 
checked presence and edited Daan leaving the study
 2019-03-25 15:34:47 +00:00
Merel Steenbergen
698c6ef7fd Delete Daan from README 2019-03-25 15:28:53 +00:00
Merel Steenbergen
4be4853685 Delete corequadrant-KP.png 2019-03-25 15:27:36 +00:00
Merel Steenbergen
36c67ce217 Delete KristinPeneva.jpg 2019-03-25 15:27:20 +00:00
Merel Steenbergen
cb15a1fefe Delete Daan_Sneep_PDP_Core_Quadrant.PNG 2019-03-25 15:27:11 +00:00
Merel Steenbergen
19f4a73119 Delete Daan_Sneep.png 2019-03-25 15:27:00 +00: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
2e745e690c Merge branch 'createCalculator' into 'master' 
Merge createCalculator branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!41
 2019-03-25 13:40:13 +00:00
Merel Steenbergen
1cec006178 FIX: Create-drop databse. Add ManyToMany annotation 2019-03-25 14:37:45 +01:00
cugurlu
cf0952c7c2 Upload coverage report 2019-03-25 13:54:18 +01:00
cugurlu
b0d69bfc2c Upload checkstyle report 2019-03-25 13:52: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
b9fb7d81ce Merge branch 'updateDoc' into 'master' 
Update doc

See merge request cse1105/2018-2019/oopp-group-43/template!40
 2019-03-25 09:22:36 +00:00
Mika Wauben
563ae51408 ADD:: review sprint4 2019-03-25 09:17:58 +00:00
Mika Wauben
caa86f446d ADD:: notes week6 2019-03-25 09:06:52 +00:00
Mika Wauben
ce669b47d2 ADD:: backlog sprint5 2019-03-25 09:04:16 +00:00
Mika Wauben
97d2a0f6fc Add new directory 2019-03-25 09:03:54 +00:00