sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684 Commits 4 Branches 6 Tags
facebc13341d83d0166d6a429c156db2dbe9974d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mika Wauben facebc1334 Merge branch 'Fix/LastCheckstyles' into 'master' 
FIX:: checkstyle error button and missing javadoc

See merge request cse1105/2018-2019/oopp-group-43/template!90
 2019-04-15 05:44:50 +00:00
Mika Wauben 84793dc924 FIX:: checkstyle error button and missing javadoc 2019-04-15 05:44:49 +00:00
Mika Wauben 60f8b2a9d9 Merge branch 'Update/leaderBoards' into 'master' 
Update/leader boards

See merge request cse1105/2018-2019/oopp-group-43/template!88
 2019-04-13 10:38:58 +00: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
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
 2019-04-09 07:30:08 +00:00
Mika Wauben 222489a316 Update/readme 2019-04-09 07:30:07 +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
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
Mika Wauben 922a7d1fae Merge branch 'Feature/achievements' into 'master' 
Feature/achievements

See merge request cse1105/2018-2019/oopp-group-43/template!63
 2019-04-04 11:05:22 +00:00
mlwauben 82eb5575ee FIX:: checkstyle errors (except Cyclomatic Complexity ones) 2019-04-04 08:00:47 +02:00
Mika Wauben 84154fca3a Merge branch 'master' into 'Feature/achievements' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/Friend.java
#   src/Client/src/main/java/greenify/client/Hints.java
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/rest/UserService.java
#   src/Client/src/main/resources/fxml/dashboard.fxml
#   src/Client/src/test/java/UserServiceTest.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/rest/UserController.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/rest/UserControllerTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-04-04 05:45:17 +00:00
mlwauben 3aad682394 FIX:: (possible) merge conficts 2019-04-03 22:05:48 +02:00
mlwauben 28f9f72f07 UPDATE:: achievement things, tests/checkstyle and it actually works now 2019-04-03 20:34:04 +02:00
Mika Wauben 5a412cd170 Merge branch 'fix/checkstyle' into 'master' 
Fix/checkstyle

See merge request cse1105/2018-2019/oopp-group-43/template!55
 2019-04-01 11:38:24 +00:00
Mika Wauben 644f466696 Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle 2019-04-01 11:38:23 +00:00
Mika Wauben fcaf3ddb49 Merge branch 'update/doc' into 'master' 
Update/doc

See merge request cse1105/2018-2019/oopp-group-43/template!54
 2019-03-31 17:45:31 +00:00
Mika Wauben 8f026a960e UPDATE:: readme, wow 4 commits for one file 2019-03-31 17:31:28 +00:00
Mika Wauben b8bb8dc91c UPDATE:: readme, slowly getting there 2019-03-31 17:30:09 +00:00
Mika Wauben a5dd8667b9 UPDATE:: readme because I am an idiot and didn't save my file yet ... 2019-03-31 17:27:56 +00:00
Mika Wauben 947ae660a0 UPDATE:: readme (start of the great readme) 2019-03-31 17:26:58 +00:00
Mika Wauben c85432fb48 ADD:: agenda week8 2019-03-31 16:57:50 +00:00
Mika Wauben f133e80ce3 Add new directory 2019-03-31 16:57:31 +00:00
Mika Wauben 97577cfd1c ADD:: backlog sprint6 2019-03-31 16:57:01 +00:00
Mika Wauben 0cfead72af Add new directory 2019-03-31 16:56:39 +00:00
Mika Wauben c3124f509e ADD:: scrumboard sprint5 2019-03-31 16:56:24 +00:00
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
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
mlwauben ca11cd3c9a DEBUG:: achievement things (tests all work now) 2019-03-30 11:29:39 +01: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
mlwauben c62e4719ea ADD:: test fxml+controller 2019-03-28 23:11:58 +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
Mika Wauben 0751f50026 Update build.gradle 2019-03-26 15:34:50 +01:00
mlwauben c6ff4862e6 DELETE:: not used imports 2019-03-26 15:21:23 +01:00
mlwauben cf96ac30b8 FIX:: checkstyle fixes 2019-03-26 11:55:05 +01:00
mlwauben 8677ac94ef FIX:: checkstyle 'client' 2019-03-26 11:34:53 +01:00
mlwauben bd21e30f26 FIX:: checkstyle 'client' tests 2019-03-26 11:00:24 +01:00
mlwauben 9e345ee353 FIX:: checkstyle fixes 2019-03-26 10:55:12 +01:00
mlwauben d8ced45a67 FIX:: checkstyle server user tests 2019-03-26 09:59:00 +01:00
mlwauben 72cb770861 FIX:: checkstyle 'server', things with user 2019-03-26 09:49:27 +01:00
mlwauben 0ae5e7f4ee FIX:: checkstyle 'common' 2019-03-26 08:46:54 +01:00
mlwauben 4200ae587d FIX:: CI 2019-03-26 08:26:40 +01:00
mlwauben f28a4ea924 FIX:: application classes server+client 2019-03-26 08:25:09 +01:00
Mika Wauben ec37bdcd79 Update build.gradle 2019-03-26 07:05:10 +00:00
Mika Wauben 563ae51408 ADD:: review sprint4 2019-03-25 09:17:58 +00:00
Mika Wauben caa86f446d ADD:: notes week6 2019-03-25 09:06:52 +00:00
Mika Wauben ce669b47d2 ADD:: backlog sprint5 2019-03-25 09:04:16 +00:00
Mika Wauben 97d2a0f6fc Add new directory 2019-03-25 09:03:54 +00:00
Mika Wauben 2dce37222d ADD:: retrospective sprint4 2019-03-25 09:03:37 +00:00
Mika Wauben a973ab0750 ADD:: scrum board sprint4 2019-03-25 09:03:08 +00:00
Mika Wauben 5b3896d310 Merge branch 'AddFriends' into 'master' 
Add basic friends

See merge request cse1105/2018-2019/oopp-group-43/template!37
 2019-03-23 12:09:33 +00:00
Mika Wauben 436343d170 Merge branch 'updateDoc' into 'master' 
Update doc

See merge request cse1105/2018-2019/oopp-group-43/template!31
 2019-03-18 11:46:30 +00:00
Mika Wauben 8caf3bdac9 ADD: review sprint3 2019-03-18 11:38:29 +00:00
Mika Wauben 2e747fdc89 Delete 20190318_sprint_review.txt 2019-03-18 11:37:20 +00:00
Mika Wauben 0ca0a516bd ADD: review sprint3 2019-03-18 11:37:10 +00:00
Mika Wauben bb89b67e87 ADD: review sprint2 2019-03-18 11:36:41 +00:00
Mika Wauben ba4b40efab ADD: review sprint1 2019-03-18 11:36:21 +00:00
Mika Wauben dbde18d3f2 ADD: scrum board sprint2 2019-03-18 11:35:19 +00:00
Mika Wauben a15cfc21fc Delete 20191003_scrumboard.png 2019-03-18 11:35:02 +00:00
Mika Wauben 9c9a98c738 ADD: scrum board sprint1 2019-03-18 11:34:50 +00:00
Mika Wauben 3af4d1778f Delete 20190403_scrumboard.png 2019-03-18 11:34:31 +00:00
Mika Wauben d3c42e70fe ADD: backlog sprint4 2019-03-18 11:34:02 +00:00
Mika Wauben 8870ed1f56 Add new directory 2019-03-18 11:33:42 +00:00
Mika Wauben f018484556 ADD: retrospective sprint3 2019-03-18 11:31:44 +00:00
Mika Wauben e12d5945ff Upload scrum board sprint3 2019-03-18 11:31:05 +00:00
Mika Wauben af25d85440 Merge branch 'basic_authentication' into 'master' 
Merge basic_authentication into master

See merge request cse1105/2018-2019/oopp-group-43/template!16
 2019-03-17 08:57:12 +00:00
Mika Wauben 7edd9e7ed0 ADD: sprint2 review 2019-03-14 12:11:23 +00:00
Mika Wauben b25e9a0db2 REPLACE scrumboard sprint2 2019-03-14 12:03:34 +00:00
Mika Wauben a12f364df0 Delete 20191003_scrumboard.png 2019-03-14 12:03:16 +00:00
Mika Wauben ceac07b27b REPLACE scrumboard sprint1 2019-03-14 12:02:30 +00:00
Mika Wauben 664a941976 Delete 20190403_scrumboard.png 2019-03-14 12:02:10 +00:00
Mika Wauben a9c99ed678 REPLACE scrumboard sprint1 2019-03-14 12:01:52 +00:00
Mika Wauben aa448506d7 ADD: sprint1 review 2019-03-14 10:45:27 +00:00
Mika Wauben c0fdb466d5 Merge branch 'changeDoc' into 'master' 
Change doc

See merge request cse1105/2018-2019/oopp-group-43/template!10
 2019-03-11 13:37:18 +00:00
Mika Wauben 60907b30f7 Add backlog sprint3 2019-03-11 13:21:43 +00:00
Mika Wauben dc5534ae34 Add retrospective sprint2 2019-03-11 13:12:50 +00:00
Mika Wauben 2a0210326e Add new directory 2019-03-11 13:06:13 +00:00