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

342 Commits

Author SHA1 Message Date
Merel Steenbergen
ae7e36f757 ADD::Extra hints 2019-04-08 15:30:21 +02:00
Merel Steenbergen
917d3a64bb FIXX:: Checkstyle 2019-04-08 15:30:21 +02:00
Merel Steenbergen
92ff0073e8 EDIT::Change some hints and add tests 2019-04-08 15:30:21 +02:00
Sem van der Hoeven
3cc01e4f4a EDIT::added style to logout button 2019-04-08 15:02:15 +02:00
Ceren Ugurlu
7043f7253d Merge branch 'fix/sorting_bugs' into 'master' 
Fix sorting bugs

See merge request cse1105/2018-2019/oopp-group-43/template!76
 2019-04-08 12:37:57 +00:00
cugurlu
b99b66b87b Fix sorting errors 2019-04-08 14:34:38 +02:00
Sem van der Hoeven
6ba21c331d FIX::fixed compileJava build failing 
the last merge undid the change of this line, this should fix it
 2019-04-08 14:21:20 +02:00
Sem van der Hoeven
0cda63cacb Merge branch 'add/activity_tooltips' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into add/activity_tooltips 
sourceTree needed to merge this?
 2019-04-08 14:19:06 +02:00
Sem van der Hoeven
79fd69503c FIX::fixed complieJava build failing 2019-04-08 14:17:06 +02:00
Sem van der Hoeven
cbf15d9574 Merge branch 'master' into 'add/activity_tooltips' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
 2019-04-08 12:13:44 +00:00
Sem van der Hoeven
18a0973af4 EDIT::added style to tooltips and reduced delay between hovering over the achievement and the tooltip appearing 
EDIT::fixed some checkstyle warnings
 2019-04-08 14:00:21 +02:00
Sem van der Hoeven
9e37421d6d ADD::added tooltip texts to all achievements 2019-04-08 13:08:20 +02:00
Sem van der Hoeven
31def99398 ADD::added buttons to apply tooltips to for the activities 
because you can't apply tooltips to imageviews, I added the achievement images to buttons to which you can add tooltips
 2019-04-08 12:55:32 +02:00
cugurlu
8195650226 Fix all errors for extra activities 2019-04-08 11:17:34 +02:00
cugurlu
9310674301 Fix checkstyle errors 2019-04-08 11:17:02 +02:00
Sem van der Hoeven
2025fd02cc Merge branch 'feature/localProduce_and_publicTransport' into 'master' 
feature/buying local produce and using public transport

See merge request cse1105/2018-2019/oopp-group-43/template!70
 2019-04-07 17:57:01 +00:00
Sem van der Hoeven
b05b0ecaf7 DELETE::deleted the confirm methods for the extra activities 
this should fix the build failing
 2019-04-07 17:55:57 +02:00
cugurlu
e1489bda27 Update controllers for new properties of achievements 2019-04-07 15:51:27 +02:00
cugurlu
a2805c2a9f Update dashboard.fxml 2019-04-07 15:50:31 +02:00
cugurlu
16fb86c513 Update achievements in userService 2019-04-07 15:49:51 +02:00
cugurlu
1cd46940cf Add new achievement photos 2019-04-07 15:48:55 +02:00
Sem van der Hoeven
e9efdf5f24 Merge branch 'master' into 'feature/localProduce_and_publicTransport' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java
#   src/Client/src/main/resources/fxml/extraActivities.fxml
 2019-04-07 12:16:42 +00:00
cugurlu
d210e22788 Fix ButtonSkin error 2019-04-06 22:35:13 +02:00
cugurlu
1cf3af45be Add many new tests 2019-04-06 22:30:46 +02:00
cugurlu
24be00d28a Update methods for extras 2019-04-06 21:29:49 +02:00
cugurlu
e30f312c6a Update calculator methods for new changes 2019-04-06 21:26:52 +02:00
cugurlu
95d5b2b971 Fix the number of decimal points of footprints 2019-04-06 21:26:17 +02:00
Sem van der Hoeven
c0e0063465 ADD::added animations to buttons in login and register window 2019-04-06 21:05:19 +02:00
Sem van der Hoeven
61a99d47d1 ADD::added local produce and public transport sections to the extra activities section 
added the panes and designated buttons

ADD::added placeholder methods for communicating adding the activities to the server
 2019-04-06 20:20:01 +02:00
Mika Wauben
2a873a78c9 Merge branch 'master' into 'update/achievements' 
# Conflicts:
#   src/Server/src/main/java/greenify/server/service/AchievementService.java
 2019-04-06 14:18:45 +00:00
mlwauben
0e546bc25c FIX:: checkstyle 2019-04-06 16:14:17 +02:00
mlwauben
4293790ece FIX:: wrong test 2019-04-06 15:42:14 +02:00
Mika Wauben
290694c5f1 Merge branch 'Feature/logoutbutton' into 'master' 
ADD:: logout button

See merge request cse1105/2018-2019/oopp-group-43/template!67
 2019-04-06 13:37:35 +00:00
mlwauben
eeb0fd9d57 ADD:: extra achievements and tests 2019-04-06 15:36:44 +02:00
mlwauben
238c00ff46 DEBUG:: logoutbutton 2019-04-06 11:05:06 +02:00
mlwauben
4433d509bb ADD:: new achievements 2019-04-06 10:33:36 +02:00
mlwauben
0f9cd14036 ADD:: line thingy above the logout button 2019-04-06 09:18:24 +02:00
mlwauben
9af14e6015 ADD:: logout button 2019-04-06 09:00:20 +02:00
Merel Steenbergen
bce08eb6f2 DELETE::Wrong import that gave an error 2019-04-05 20:40:50 +02:00
Merel Steenbergen
dcb8404ae7 ADD::Method for achievement social butterfly 2019-04-05 20:37:54 +02:00
Merel Steenbergen
82fd016590 FIX::No longer use Mockito for AchievementService in AchievementServiceTest 2019-04-05 20:30:31 +02:00
Merel Steenbergen
ccbe5968da EDIT::Finding bugs in tests and try to fix them 2019-04-05 20:21:42 +02:00
Merel Steenbergen
adb8406d4e ADD::Some tests to achievement class 2019-04-05 19:59:57 +02:00
Merel Steenbergen
7228252169 Merge branch 'add/add_random_hints_to_GUI' into 'master' 
add/added hints to GUI

See merge request cse1105/2018-2019/oopp-group-43/template!65
 2019-04-05 14:49:28 +00:00
Merel Steenbergen
f2501f3624 FIX::Resolve a merge conflict with DashBoardController 2019-04-05 13:18:21 +00:00
Sem van der Hoeven
2b7d51a5ed EDIT::edited font size of random hints 2019-04-05 13:13:27 +02:00
Sem van der Hoeven
75faf4ae8c ADD:added nodes and methods to display random hints to on the GUI 
ADD::added refresh button to get a new hint

EDIT::edited hints to work with the GUI
 2019-04-05 13:11:17 +02:00
Sem van der Hoeven
06daa4776f ADD::added animations to buttons on dashboard screen 
EDIT::changed labels of distance in activities overview to km and km/L

EDIT::made firstCalculator.fxml have the right distance units and added the new extra activities screen
 2019-04-05 09:54:34 +02:00
Sem van der Hoeven
4b07aa8072 EDIT::changed achievement picture, removed trademark and added it into the code 2019-04-05 09:24:58 +02:00
Merel Steenbergen
1f12291398 FIX::Import error 2019-04-04 21:00:37 +02:00