sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
685 Commits 4 Branches 6 Tags
5ef716330c084a8b747920532f0cbf6600149f05
Commit Graph
336 Commits
Author SHA1 Message Date
Mika Wauben 84793dc924 FIX:: checkstyle error button and missing javadoc 2019-04-15 05:44:49 +00:00
cugurlu f8799c06fb Add new plugins for heroku 2019-04-14 18:28:29 +02:00
cugurlu f20f010cb8 Remove unnecessary prints 2019-04-14 18:28:04 +02:00
cugurlu 048253a9d3 Add password hashing 2019-04-14 18:27:37 +02:00
cugurlu 8d029fe21c Fix removeFriend image 2019-04-14 18:26:54 +02:00
Mika Wauben 66c2b44be6 Merge branch 'master' into 'Update/leaderBoards' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
#   src/Client/src/main/resources/fxml/dashboard.fxml
#   src/Server/src/main/java/greenify/server/service/CalculatorService.java
 2019-04-13 10:38:58 +00:00
cugurlu 6084338525 Fix checkstyle errors 2019-04-11 14:24:07 +02:00
cugurlu 9006588eed Add new methods to controllers to remove a friend 2019-04-11 14:23:40 +02:00
cugurlu 367daa1eff Edit dashboard.fxml 2019-04-11 14:22:58 +02:00
cugurlu a2af22facb Add fxml file and image for removeFriend property 2019-04-11 14:22:41 +02:00
cugurlu abdaa14679 Fix small problem in AchievementService 2019-04-11 14:22:13 +02:00
Merel Steenbergen 461b3bd329 Merge branch 'Feature/explanation' into 'master' 
Explanation in first calculator screen

See merge request cse1105/2018-2019/oopp-group-43/template!84
 2019-04-10 20:43:41 +00:00
Sem van der Hoeven f56a959720 Merge branch 'add/more_animations' into 'master' 
Add/more animations

See merge request cse1105/2018-2019/oopp-group-43/template!85
 2019-04-10 19:25:41 +00:00
Merel Steenbergen 2b1c6cf780 FIX::Import that gave a CheckStyle error.java 2019-04-10 13:40:39 +00:00
Merel Steenbergen eed4f7903d FIX::Small typing error in method name.java 2019-04-10 13:40:08 +00:00
Sem van der Hoeven 377db10f13 EDIT::changed color of register window button 2019-04-10 12:24:11 +02:00
Sem van der Hoeven 50fb2078b0 EDIT::fixed checkstyle import 2019-04-10 12:22:23 +02:00
Sem van der Hoeven 123a767a75 ADD::added style to button in register window 2019-04-10 12:19:31 +02:00
Sem van der Hoeven e0e6744c95 EDIT::removed lines from background of vegetarian meals achievement picture 2019-04-10 12:07:07 +02:00
Sem van der Hoeven cfc238af73 ADD::Added animations to switching panes in extra activities 2019-04-10 12:04:17 +02:00
Sem van der Hoeven 78e050751f ADD::added animations to buttons in login and register screen 2019-04-10 11:49:31 +02:00
Merel Steenbergen 81f48ca0b6 FIX::Checkstyle errors 2019-04-09 17:40:26 +02:00
Merel Steenbergen d97ae9b53a FIX::Checkstyle error 2019-04-09 17:38:44 +02:00
Merel Steenbergen 2a136b6a07 ADD::Client.UserServiceTest 2019-04-09 17:37:51 +02:00
Merel Steenbergen 080053765c ADD::server.UserControllerTest 2019-04-09 17:35:39 +02:00
Merel Steenbergen 21ab3d5b79 ADD::server.userService Tests 2019-04-09 17:30:58 +02:00
Merel Steenbergen 8e747e54be ADD::Clientside method 2019-04-09 17:03:56 +02:00
Merel Steenbergen 99899dfc88 Add serverside methods 2019-04-09 17:00:51 +02:00
Merel Steenbergen 867eae66f4 ADD::Explanation in first calculator screen 2019-04-09 16:28:17 +02:00
Mika Wauben a704522a63 UPDATE:: activities pane (added all extra activities) 2019-04-09 13:37:28 +00:00
Merel Steenbergen 4b949db919 Merge branch 'Delete/forgot_password' into 'master' 
DELETE 'forgot password' button

See merge request cse1105/2018-2019/oopp-group-43/template!80
 2019-04-08 14:44:30 +00:00
Merel Steenbergen c8d5dd99ae DELETE 'forgot password' button 2019-04-08 15:59:23 +02:00
Sem van der Hoeven 6d7e73586f Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
Sourcetree needed to merge this?
 2019-04-08 15:52:20 +02:00
Sem van der Hoeven 12ca633461 EDIT::suppressed some duplicate warnings 2019-04-08 15:51:44 +02:00
Merel Steenbergen 7b6b8ead65 Merge branch 'Feature/more_hints' into 'master' 
Feature/more hints

See merge request cse1105/2018-2019/oopp-group-43/template!78
 2019-04-08 13:46:40 +00:00
Ceren Ugurlu a206625082 Merge branch 'add_piechart' into 'master' 
Add piechart

See merge request cse1105/2018-2019/oopp-group-43/template!77
 2019-04-08 13:45:17 +00:00
Merel Steenbergen f6f74cd2aa FIX::Checkstyle errors 2019-04-08 15:38:49 +02:00
cugurlu d03deace57 Add new test methods 2019-04-08 15:36:42 +02:00
cugurlu 4dd02649b8 Add methods for getting the results of a user 2019-04-08 15:36:21 +02:00
cugurlu 9fd3b1cf5b Add new methods for piechart 2019-04-08 15:35:35 +02:00
Sem van der Hoeven 9fc42247da EDIT::added required values to saving co2 and using bike achievements 2019-04-08 15:33:18 +02:00
Merel Steenbergen fb22937864 FIX::Illegal catch fix: RuntimeException to HttpClientErrorException 2019-04-08 15:32:09 +02:00
Merel Steenbergen dc432df120 FIX::More CS errors 2019-04-08 15:31:34 +02:00
Merel Steenbergen a6a52688f2 FIX::Checkstyle errors 2019-04-08 15:30:37 +02:00
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