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
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
37d43c8247 Merge branch 'Update/activitiesPane' into 'master' 
UPDATE:: activities pane (added all extra activities)

See merge request cse1105/2018-2019/oopp-group-43/template!82
 2019-04-09 13:37:28 +00:00
Mika Wauben
a704522a63 UPDATE:: activities pane (added all extra activities) 2019-04-09 13:37:28 +00:00
Mika Wauben
cefc4d2b4b Merge branch 'Update/readme' into 'master' 
Update/readme

See merge request cse1105/2018-2019/oopp-group-43/template!79
v0.2.1 		2019-04-09 07:30:08 +00:00
Mika Wauben
222489a316 Update/readme 2019-04-09 07:30:07 +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
Sem van der Hoeven
c8cbb25f5d Merge branch 'update/notes_week9' into 'master' 
Update/notes week9

See merge request cse1105/2018-2019/oopp-group-43/template!81
 2019-04-08 14:19:03 +00:00
Sem van der Hoeven
5653800d47 ADD::Added notes for week 9 2019-04-08 16:15:44 +02: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
Sem van der Hoeven
a715babcd9 ADD::added first part of notes week 9 2019-04-08 15:50:08 +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
425550c922 FIX::Uncomment something to make pipeline pass 2019-04-08 15:41:01 +02:00
Merel Steenbergen
e6ecda5471 FIX::Small merge conflict 2019-04-08 15:39:53 +02: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
Sem van der Hoeven
83611c4ecc Merge branch 'add/activity_tooltips' into 'master' 
Add/activity tooltips

See merge request cse1105/2018-2019/oopp-group-43/template!75
 2019-04-08 12:36:45 +00:00
cugurlu
b99b66b87b Fix sorting errors 2019-04-08 14:34:38 +02:00
Sem van der Hoeven
3e7fbeae75 EDIT::Update .gitlab-ci.yml 
undid code coverage part
 2019-04-08 12:27:06 +00:00
Sem van der Hoeven
839292ad91 EDIT::Update .gitlab-ci.yml 
added code coverage
 2019-04-08 12:26:23 +00: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
Mika Wauben
8667f65e33 Merge branch 'update/doc' into 'master' 
Update/doc

See merge request cse1105/2018-2019/oopp-group-43/template!74
 2019-04-08 12:07:27 +00:00
Mika Wauben
544b756e70 Update/doc 2019-04-08 12:07:27 +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
Ceren Ugurlu
dbe6fc4e33 Delete README.md 2019-04-08 10:38:36 +00:00
Ceren Ugurlu
231c580f7a Merge branch 'connect_new_extras' into 'master' 
Fix errors for new extras and upload docs

See merge request cse1105/2018-2019/oopp-group-43/template!73
 2019-04-08 09:27:16 +00:00