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

701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Merel Steenbergen
1f12291398 FIX::Import error 2019-04-04 21:00:37 +02:00
Merel Steenbergen
1684068385 FIX::More CheckStyle errors 2019-04-04 20:59:08 +02:00
Merel Steenbergen
e929680477 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts 2019-04-04 20:55:10 +02:00
Merel Steenbergen
f23fc2cbea FIX::Checkstyle errors 2019-04-04 20:54:50 +02:00
Merel Steenbergen
4fa2707add FIX:: Fixed small typing error in alert 2019-04-04 18:51:04 +00:00
Merel Steenbergen
7ac5b1efda FIX:: Small bug fix, pipeline should now run 2019-04-04 20:45:10 +02:00
Merel Steenbergen
b08174b2ee ADD:: Alerts: username is now your friend and calculation saved. 2019-04-04 20:42:25 +02:00
Merel Steenbergen
04db410293 FIX::Merge conflict fix in DashBoardController 2019-04-04 20:36:37 +02:00
Merel Steenbergen
c5e7ff2884 ADD::Alert for incorrect password/username at login. 2019-04-04 20:35:02 +02:00
Merel Steenbergen
c8521feaf8 ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-04 13:26:36 +02:00
Merel Steenbergen
25a66832a5 ADD:: Alert for taken username 2019-04-04 13:26:36 +02:00
Merel Steenbergen
a55e4cecef Added class Hints, including tests 2019-04-04 13:26:35 +02:00
Merel Steenbergen
5c85c56d78 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts 2019-04-04 13:23:00 +02:00
Merel Steenbergen
c79a98c57d ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-04 13:20:47 +02:00
Merel Steenbergen
81701758d7 ADD:: Alert for taken username 2019-04-04 13:20:47 +02:00
Merel Steenbergen
4b04487a25 Added class Hints, including tests 2019-04-04 13:20:47 +02:00
Sem van der Hoeven
50c27cf420 FIX::fixed checkstyle errors 
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

# Conflicts:
#	src/Client/src/main/java/greenify/client/Hints.java
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Server/src/main/java/greenify/server/service/CalculatorService.java
 2019-04-04 13:16:33 +02:00
Sem van der Hoeven
5526c8f467 FIX::fixed checkstyle errors 2019-04-04 13:14:03 +02:00
Mika Wauben
922a7d1fae Merge branch 'Feature/achievements' into 'master' 
Feature/achievements

See merge request cse1105/2018-2019/oopp-group-43/template!63
 2019-04-04 11:05:22 +00:00
Sem van der Hoeven
6ced05278b ADD::added animations to extra activities section 2019-04-04 10:43:32 +02:00
Sem van der Hoeven
9e6505dfa3 ADD::added animations to switching sections in calculator 2019-04-04 10:01:07 +02:00
Sem van der Hoeven
86f1b724c7 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-04-04 09:27:52 +02:00
Sem van der Hoeven
90d50624f6 EDIT::added imports to dashboard.fxml 2019-04-04 09:27:09 +02:00
mlwauben
82eb5575ee FIX:: checkstyle errors (except Cyclomatic Complexity ones) 2019-04-04 08:00:47 +02:00
Mika Wauben
84154fca3a Merge branch 'master' into 'Feature/achievements' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/Friend.java
#   src/Client/src/main/java/greenify/client/Hints.java
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/rest/UserService.java
#   src/Client/src/main/resources/fxml/dashboard.fxml
#   src/Client/src/test/java/UserServiceTest.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/rest/UserController.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-04-04 05:45:17 +00:00
mlwauben
3aad682394 FIX:: (possible) merge conficts 2019-04-03 22:05:48 +02:00
Merel Steenbergen
b5c834fc52 ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-03 21:51:35 +02:00
Merel Steenbergen
1ff84ce3d8 ADD:: Alert for taken username 2019-04-03 21:44:50 +02:00
Sem van der Hoeven
c5f7cac9db Merge branch 'add_details_extra_activities' into 'master' 
add/added extra activities GUI

See merge request cse1105/2018-2019/oopp-group-43/template!62
 2019-04-03 19:15:46 +00:00
Sem van der Hoeven
19fef1d4c8 FIX::resolved merge conflict and this fixed the issue where it wouldn't set the children of the extra pane 
Merge branch 'master' into 'add_details_extra_activities'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
 2019-04-03 19:11:51 +00:00
mlwauben
28f9f72f07 UPDATE:: achievement things, tests/checkstyle and it actually works now 2019-04-03 20:34:04 +02:00
Merel Steenbergen
f5250aa2a0 Merge branch 'Feature/hints' into 'master' 
Added some 'Green hints'

See merge request cse1105/2018-2019/oopp-group-43/template!61
 2019-04-03 18:08:09 +00:00
Sem van der Hoeven
d5af8816e9 ADD::added extra activities section to calculator 
added section to calculator, and buttons to activities and dashboard to open it seperately
 2019-04-03 19:32:40 +02:00
Merel Steenbergen
6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' 
Feature/remove a friend

See merge request cse1105/2018-2019/oopp-group-43/template!60
 2019-04-03 14:29:36 +00:00
Merel Steenbergen
01e03782c2 Remove addFriend part from removeFriendTest from UserControllerTest.java 2019-04-03 13:40:53 +00:00
Merel Steenbergen
bb6d887036 Added class Hints, including tests 2019-04-03 15:33:26 +02:00
Merel Steenbergen
7b6457b286 ADD::RemoveFriend method and test in server.userController 2019-04-03 14:19:30 +02:00
Sem van der Hoeven
54d0537f95 EDIT::changed miles to kilometres in calculator 2019-04-03 11:52:03 +02:00
Ceren Ugurlu
b781727703 Delete suppression.xml 2019-04-01 17:54:41 +00:00
cugurlu
4c50eea99a Add meeting notes for week 8 2019-04-01 19:54:09 +02:00
Ceren Ugurlu
a38cd45e2a Merge branch 'add_weekly_reports' into 'master' 
Add weekly reports

See merge request cse1105/2018-2019/oopp-group-43/template!59
 2019-04-01 17:12:52 +00:00
Merel Steenbergen
e48264a667 EDIT:: Uncomment build.gradle mainClassName 2019-04-01 16:53:16 +02:00
Merel Steenbergen
12b05f3b73 ADD:: RemoveFriend method and test in client.userService 2019-04-01 16:46:01 +02:00
Merel Steenbergen
6d37b99c14 ADD:: RemoveFriend method and tests in Server.UserService 2019-04-01 16:43:10 +02:00
Merel Steenbergen
52291ac10f ADD:: Friend remove methods and tests in server.User 2019-04-01 16:36:12 +02:00
cugurlu
ae5d4a1496 Add coverage and checkstyle reports 2019-04-01 14:22:31 +02:00
Ceren Ugurlu
d7454345be Delete 20190401_checkstyle.png 2019-04-01 12:19:37 +00:00
Ceren Ugurlu
26693e8782 Merge branch 'add_savedCO2_property' into 'master' 
Add co2 saved property tables and tests

See merge request cse1105/2018-2019/oopp-group-43/template!58
v0.2 		2019-04-01 12:14:42 +00:00
cugurlu
e78be7ac9f Add co2 saved property tables and tests 2019-04-01 13:59:54 +02:00
Merel Steenbergen
a25c5da5ac Merge branch 'add/final_report_draft' into 'master' 
Add the draft of the final report

See merge request cse1105/2018-2019/oopp-group-43/template!57
 2019-04-01 11:59:32 +00:00