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

448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cugurlu
25c8951530 Add fxml file for add friend page 2019-03-29 18:10:55 +01:00
cugurlu
e41f434a28 Add new class for tableView 2019-03-29 18:10:01 +01:00
cugurlu
0530fc4ddb Add new icons 2019-03-29 18:09:31 +01:00
Ceren Ugurlu
36f36d4100 Merge branch 'connect_calculator&GUI' into 'master' 
Connect calculator with GUI

See merge request cse1105/2018-2019/oopp-group-43/template!48
 2019-03-29 13:17:15 +00:00
cugurlu
d0beb236ea Edit to connect calculator with GUI 2019-03-29 12:47:24 +01:00
Sem van der Hoeven
a92a5b6e47 Merge branch 'finish_calculator_GUI' into 'master' 
Finished calculator GUI

See merge request cse1105/2018-2019/oopp-group-43/template!47
 2019-03-28 21:37:43 +00:00
Sem van der Hoeven
56bd05324c Merge branch 'finish_calculator_GUI' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into finish_calculator_GUI 
Sourcetree needed to merge this?
 2019-03-28 22:35:54 +01:00
Sem van der Hoeven
fcea76f0e9 FIX::fixed checkstyle import error 2019-03-28 22:34:54 +01:00
Sem van der Hoeven
6fd04b1d0a EDiT:: resolved merge conflicts, most were just empty lines in master 
Merge branch 'master' into 'finish_calculator_GUI'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
#   src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-28 19:44:01 +00:00
Sem van der Hoeven
6ab7141f64 ADD::finished GUI for calculator 
now only need to add animations
 2019-03-28 14:09:36 +01:00
Sem van der Hoeven
980e64657a EDIT::finished home section of calculator 2019-03-27 20:51:14 +01:00
Ceren Ugurlu
7267a73cbe Merge branch 'develop_calculator' into 'master' 
Merge working version of calculator and tests

See merge request cse1105/2018-2019/oopp-group-43/template!46
 2019-03-27 13:35:10 +00:00
cugurlu
c9178362cc Update CalculatorServiceTest .java 2019-03-27 13:47:00 +01:00
cugurlu
42cf5a5ee4 Add new tests to increase coverage 2019-03-27 13:46:23 +01:00
cugurlu
56829cca6b Add new methods and tests for requesting 2019-03-27 13:45:28 +01:00
cugurlu
e51ef99bc9 Edit for saving setted new inputs and calculated footprint 2019-03-27 13:44:24 +01:00
cugurlu
4a31b52e69 Update InputValidator and its test for API 2019-03-27 13:42:34 +01:00
cugurlu
20c37c4899 Add tests for footprint 2019-03-27 13:41:32 +01:00
cugurlu
07f5eb0449 Add methods for calculator and fix checktsyle errors 2019-03-27 13:40:52 +01:00
Sem van der Hoeven
3dec44ada1 EDIT::Finished Travel GUI section of calculator 2019-03-27 13:10:21 +01:00
Sem van der Hoeven
1d10d1d54b ADD::almost completed travel pane of calculator 2019-03-27 09:44:34 +01:00
Merel Steenbergen
1f03552d84 Merge branch 'fix/checkstyleAndComments' into 'master' 
Fix/checkstyle and comments

See merge request cse1105/2018-2019/oopp-group-43/template!44
 2019-03-26 15:06:24 +00:00
Merel Steenbergen
2abad808ad FIX: Checkstyle fixes after merge conflicts 2019-03-26 16:01:53 +01:00
Merel Steenbergen
a540b9e8f2 Resolve merge requests 2019-03-26 15:50:11 +01:00
mlwauben
08d46ea8f0 DELETE:: not used imports 2019-03-26 15:48:51 +01:00
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
064e8e04c2 FIX:: CI 2019-03-26 15:34:50 +01:00
mlwauben
97a0e38c40 FIX:: application classes server+client 2019-03-26 15:34:50 +01:00
Mika Wauben
0751f50026 Update build.gradle 2019-03-26 15:34:50 +01:00
Merel Steenbergen
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'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/data/model/UserTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-03-26 14:33:05 +00: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
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
mlwauben
c6ff4862e6 DELETE:: not used imports 2019-03-26 15:21:23 +01: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
mlwauben
cf96ac30b8 FIX:: checkstyle fixes 2019-03-26 11:55:05 +01: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
mlwauben
8677ac94ef FIX:: checkstyle 'client' 2019-03-26 11:34:53 +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