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

478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mika Wauben
d484898ba1 ADD:: retrospective sprint5 2019-03-31 16:54:52 +00:00
Mika Wauben
bd225edea1 ADD:: review sprint5 2019-03-31 16:54:10 +00:00
Ceren Ugurlu
608d3ec40f Merge branch 'addActivitySummary_newTests' into 'master' 
Add activity summary and new tests

See merge request cse1105/2018-2019/oopp-group-43/template!53
 2019-03-31 14:12:44 +00:00
Ceren Ugurlu
c8b9b4d78f Solve the conflict 2019-03-31 13:36:21 +00:00
Sem van der Hoeven
a9f63f6fab Merge branch 'Add_extras_to_calculator' into 'master' 
edit/edited back javafx imports for checkstyle

See merge request cse1105/2018-2019/oopp-group-43/template!52
 2019-03-31 13:31:08 +00:00
Ceren Ugurlu
3f4e7cb9a9 Update README.md 2019-03-31 13:28:42 +00:00
Sem van der Hoeven
9f3597124d EDIT::edited back javafx imports for checkstyle 2019-03-31 15:28:08 +02:00
cugurlu
f4f79484fa Test all new methods 2019-03-31 15:27:07 +02:00
cugurlu
3b4add03ee Add new activity page properties 2019-03-31 15:26:48 +02:00
cugurlu
32c9713835 Add acitivitySummary to GUI 2019-03-31 15:26:06 +02:00
cugurlu
8e11ecbcf4 Add new methods for getInputMap from database 2019-03-31 15:25:40 +02:00
Ceren Ugurlu
9f45b1c8ac Merge branch 'Add_extras_to_calculator' into 'master' 
Extra section is added to the calculator

See merge request cse1105/2018-2019/oopp-group-43/template!51
 2019-03-31 13:19:54 +00:00
Sem van der Hoeven
c03538ff34 ADD::added section indicator bars to calculator 
Somehow they were deleted, so I added them again. Also added to the extra section
 2019-03-31 14:41:19 +02:00
Sem van der Hoeven
7805122c06 ADD::added 'extra' section to calculator 
added checkboxes to add extra activities
 2019-03-31 14:26:05 +02:00
Ceren Ugurlu
61ed9fc497 Merge branch 'fixBugs_addLeaderboard' into 'master' 
Fix bugs & add leaderboard

See merge request cse1105/2018-2019/oopp-group-43/template!50
 2019-03-31 11:07:47 +00:00
Sem van der Hoeven
85412af2a6 ADD::added style to friends table 2019-03-31 12:41:45 +02:00
cugurlu
5449c664bd Update README.md 2019-03-31 00:54:50 +01:00
cugurlu
b4a00fade2 Add new tests 2019-03-31 00:51:55 +01:00
cugurlu
cf1704e872 Connect server and client for getAllUsers, saveFootprint and getFootprint methods 2019-03-31 00:51:34 +01:00
cugurlu
383d505f52 Fix checkstyle errors and delete unused methods for high coverage 2019-03-31 00:50:21 +01:00
cugurlu
cc236c46b6 Add tests for userService 2019-03-31 00:49:16 +01:00
cugurlu
ed695f941d Add leaderboard and fix friend bugs 2019-03-31 00:47:21 +01:00
cugurlu
a41b697510 Fix calculator bugs 2019-03-31 00:45:50 +01:00
Sem van der Hoeven
ebaeff9fad EDIT::changed colour scheme of 'add friend' button 2019-03-30 19:29:49 +01:00
Ceren Ugurlu
1437bbc1bc Merge branch 'connect_friends_GUI' into 'master' 
Edit GUI for friend property

See merge request cse1105/2018-2019/oopp-group-43/template!49
 2019-03-30 10:58:18 +00:00
Sem van der Hoeven
0b2677fd06 ADD:added section indicators to calculator 
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

# Conflicts:
#	src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-30 11:18:50 +01:00
Sem van der Hoeven
336e56bb51 ADD:: added section indicator bars to calculator 2019-03-30 11:17:12 +01:00
Ceren Ugurlu
026cd15009 Update DashBoardController.java 2019-03-30 09:36:41 +00:00
cugurlu
a64b31001a Edit dashboard for new properties 2019-03-29 18:11:39 +01:00
cugurlu
704854e8b5 Add new controller friends 2019-03-29 18:11:16 +01:00
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