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 |
|
mlwauben
|
973e8aba69
|
UPDATE:: checkstyle fixes
|
2019-03-30 17:16:24 +01:00 |
|
mlwauben
|
7656b60fcf
|
UPDATE:: achievements and tests
|
2019-03-30 16:43:24 +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 |
|
mlwauben
|
ca11cd3c9a
|
DEBUG:: achievement things (tests all work now)
|
2019-03-30 11:29:39 +01: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 |
|
mlwauben
|
f5d9bd5010
|
UPDATE:: added achievements to user class
|
2019-03-30 09:25:12 +01:00 |
|
mlwauben
|
3d61cd061a
|
ADD:: class of achievements list
|
2019-03-30 09:02:02 +01:00 |
|
mlwauben
|
393bfc9445
|
ADD:: achievement class
|
2019-03-30 08:23:54 +01: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 |
|
mlwauben
|
c62e4719ea
|
ADD:: test fxml+controller
|
2019-03-28 23:11:58 +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 |
|