sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561 Commits 4 Branches 6 Tags
67b97eb331baa3e5368efd7bf2eb050e5a2d9440
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Merel Steenbergen 67b97eb331 FIXX:: Checkstyle 2019-04-05 17:08:58 +02:00
Merel Steenbergen daa1c838b4 EDIT::Change some hints and add tests 2019-04-05 17:00:45 +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 27a18659f8 Merge branch 'Feature/alerts' into 'master' 
Feature/alerts

See merge request cse1105/2018-2019/oopp-group-43/template!64
 2019-04-05 14:49:23 +00:00
Merel Steenbergen f2501f3624 FIX::Resolve a merge conflict with DashBoardController 2019-04-05 13:18:21 +00:00
Merel Steenbergen 8927b78098 FIX:: Forgot to uncomment something. Pipeline should now work 2019-04-04 21:02:06 +02:00
Merel Steenbergen 1f12291398 FIX::Import error 2019-04-04 21:00:37 +02:00
Merel Steenbergen 1684068385 FIX::More CheckStyle errors 2019-04-04 20:59:08 +02:00
Merel Steenbergen e929680477 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts 2019-04-04 20:55:10 +02:00
Merel Steenbergen f23fc2cbea FIX::Checkstyle errors 2019-04-04 20:54:50 +02:00
Merel Steenbergen 4fa2707add FIX:: Fixed small typing error in alert 2019-04-04 18:51:04 +00:00
Merel Steenbergen 7ac5b1efda FIX:: Small bug fix, pipeline should now run 2019-04-04 20:45:10 +02:00
Merel Steenbergen b08174b2ee ADD:: Alerts: username is now your friend and calculation saved. 2019-04-04 20:42:25 +02:00
Merel Steenbergen 04db410293 FIX::Merge conflict fix in DashBoardController 2019-04-04 20:36:37 +02:00
Merel Steenbergen c5e7ff2884 ADD::Alert for incorrect password/username at login. 2019-04-04 20:35:02 +02:00
Merel Steenbergen c8521feaf8 ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-04 13:26:36 +02:00
Merel Steenbergen 25a66832a5 ADD:: Alert for taken username 2019-04-04 13:26:36 +02:00
Merel Steenbergen a55e4cecef Added class Hints, including tests 2019-04-04 13:26:35 +02:00
Merel Steenbergen 5c85c56d78 Merge branch 'Feature/alerts' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Feature/alerts 2019-04-04 13:23:00 +02:00
Merel Steenbergen c79a98c57d ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-04 13:20:47 +02:00
Merel Steenbergen 81701758d7 ADD:: Alert for taken username 2019-04-04 13:20:47 +02:00
Merel Steenbergen 4b04487a25 Added class Hints, including tests 2019-04-04 13:20:47 +02:00
Merel Steenbergen b5c834fc52 ADD:: Alert 'Footprint saved. Still has a bug.' 2019-04-03 21:51:35 +02:00
Merel Steenbergen 1ff84ce3d8 ADD:: Alert for taken username 2019-04-03 21:44:50 +02:00
Merel Steenbergen f5250aa2a0 Merge branch 'Feature/hints' into 'master' 
Added some 'Green hints'

See merge request cse1105/2018-2019/oopp-group-43/template!61
 2019-04-03 18:08:09 +00:00
Merel Steenbergen 6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' 
Feature/remove a friend

See merge request cse1105/2018-2019/oopp-group-43/template!60
 2019-04-03 14:29:36 +00:00
Merel Steenbergen 01e03782c2 Remove addFriend part from removeFriendTest from UserControllerTest.java 2019-04-03 13:40:53 +00:00
Merel Steenbergen bb6d887036 Added class Hints, including tests 2019-04-03 15:33:26 +02:00
Merel Steenbergen 7b6457b286 ADD::RemoveFriend method and test in server.userController 2019-04-03 14:19:30 +02:00
Merel Steenbergen e48264a667 EDIT:: Uncomment build.gradle mainClassName 2019-04-01 16:53:16 +02:00
Merel Steenbergen 12b05f3b73 ADD:: RemoveFriend method and test in client.userService 2019-04-01 16:46:01 +02:00
Merel Steenbergen 6d37b99c14 ADD:: RemoveFriend method and tests in Server.UserService 2019-04-01 16:43:10 +02:00
Merel Steenbergen 52291ac10f ADD:: Friend remove methods and tests in server.User 2019-04-01 16:36:12 +02:00
Merel Steenbergen a25c5da5ac Merge branch 'add/final_report_draft' into 'master' 
Add the draft of the final report

See merge request cse1105/2018-2019/oopp-group-43/template!57
 2019-04-01 11:59:32 +00:00
Merel Steenbergen 5ab7deb210 Rename the draft final report 2019-04-01 11:57:52 +00:00
Merel Steenbergen 9ad503db0d ADD: Right version of the draft of the final report 2019-04-01 13:51:24 +02:00
Merel Steenbergen 118ae797f5 Upload draft of the final report 2019-04-01 11:37:02 +00: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
Merel Steenbergen 470a31889a Resolved the conflicts. We should check if the JavaDoc is still in the right place, because it looked a little weird while resolving the conflicts 
Merge branch 'master' into 'fix/checkstyleAndComments'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/data/model/UserTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-03-26 14:33:05 +00:00
Merel Steenbergen 90bf334c19 Merge branch 'AddFriends' into 'master' 
Add methods and tests for friends.

See merge request cse1105/2018-2019/oopp-group-43/template!43
 2019-03-26 14:29:14 +00:00
Merel Steenbergen 12e677607d Merge branch 'Add_Calculator_to_GUI' into 'master' 
merge 'add calculator to gui' to first fix master

See merge request cse1105/2018-2019/oopp-group-43/template!45
 2019-03-26 14:27:23 +00:00
Merel Steenbergen 4780ae7b11 Revert changes: AssertArrayEquals doesn't work on ArrayLists 2019-03-26 13:56:48 +00:00
Merel Steenbergen b1f3725f71 Change wrong url (setInput to addFriend) on Client userService 2019-03-26 13:52:13 +00:00
Merel Steenbergen 1668731624 Use assertArrayEquals instead of AssertEquals 2019-03-26 13:49:29 +00:00
Merel Steenbergen d6640966c5 Merge branch 'AddDocs' into 'master' 
Add notes

See merge request cse1105/2018-2019/oopp-group-43/template!42
 2019-03-26 10:55:53 +00:00
Merel Steenbergen 4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
Merel Steenbergen c61469476b Uncommented mainClassName 2019-03-26 11:37:47 +01:00
Merel Steenbergen f11cfc804b Add test for leaderboard JSON 2019-03-26 11:31:41 +01:00
Merel Steenbergen f39aef31d0 Fix checkstyle errors 2019-03-26 11:24:10 +01:00
Merel Steenbergen 4a6d4c7043 Friend list to JSON method added 2019-03-26 11:07:04 +01:00
Merel Steenbergen cc9f8196bc Added tests and method to make sure you cannot add yourself as a friend 2019-03-26 10:56:45 +01:00
Merel Steenbergen 7a4a031b1d Added some tests for friend methods 2019-03-26 10:47:12 +01:00
Merel Steenbergen ba5e261c7f Resolve merge conflicts 2019-03-26 10:28:57 +01:00
Merel Steenbergen 471d41a600 Commit small changes before rebase 2019-03-26 10:26:29 +01:00
Merel Steenbergen a1ba2f1d7d FIX: Create-drop databse. Add ManyToMany annotation 2019-03-26 10:26:29 +01:00
Merel Steenbergen 28cd0d0d7f FIX: Database fix 2019-03-26 10:24:57 +01:00
Merel Steenbergen 437267dcb9 Commit small changes before rebase 2019-03-26 10:24:21 +01:00
Merel Steenbergen 559885e22b Upload notes 25-03-2019 2019-03-26 09:16:26 +00:00
Merel Steenbergen 698c6ef7fd Delete Daan from README 2019-03-25 15:28:53 +00:00
Merel Steenbergen 4be4853685 Delete corequadrant-KP.png 2019-03-25 15:27:36 +00:00
Merel Steenbergen 36c67ce217 Delete KristinPeneva.jpg 2019-03-25 15:27:20 +00:00
Merel Steenbergen cb15a1fefe Delete Daan_Sneep_PDP_Core_Quadrant.PNG 2019-03-25 15:27:11 +00:00
Merel Steenbergen 19f4a73119 Delete Daan_Sneep.png 2019-03-25 15:27:00 +00:00
Merel Steenbergen 1cec006178 FIX: Create-drop databse. Add ManyToMany annotation 2019-03-25 14:37:45 +01:00
Merel Steenbergen e494b5294d Revert "Merge branch 'AddFriends' into 'master'" 
This reverts merge request !37
 2019-03-23 17:31:00 +00:00
Merel Steenbergen 18c3ce0c92 FIX: Database fix 2019-03-23 18:26:01 +01:00
Merel Steenbergen f8315700d9 FIX: Uncomment mainClassName 2019-03-22 21:57:05 +01:00
Merel Steenbergen 6385beec06 FIX: Tests now work 2019-03-22 21:51:09 +01:00
Merel Steenbergen 12c2ebab4e Debugging in progress. FindByName returns null again. 2019-03-22 20:20:39 +01:00
Merel Steenbergen e69e08ad15 EDIT: Try to fix server, again 2019-03-22 18:44:59 +01:00
Merel Steenbergen 6323fd06eb FIX: Bug fixed, Server now works again 2019-03-21 16:14:50 +01:00
Merel Steenbergen fb69ec280d Added testing for the friend list and equals in User class in Server 2019-03-21 16:09:23 +01:00
Merel Steenbergen b3a0ddaa68 Retry adding friends. Server down again 2019-03-20 15:44:47 +01:00
Merel Steenbergen 0c042daa1c DTO changed to Dto. Still some errors 2019-03-17 18:31:55 +01:00
Merel Steenbergen bfc9595d21 Changed DTO files to Dto because of checkstyle 2019-03-17 18:23:18 +01:00
Merel Steenbergen dd74a97c47 Merge branch 'AddFeatureClass' into 'master' 
Add feature class

See merge request cse1105/2018-2019/oopp-group-43/template!25
 2019-03-17 17:10:37 +00:00
Merel Steenbergen 018a164723 Fixed tests 2019-03-17 18:01:59 +01:00
Merel Steenbergen 061a6fc957 Delete useless file 2019-03-17 17:57:18 +01:00
Merel Steenbergen ba98b30776 Fix merge conflicts 2019-03-17 17:54:24 +01:00
Merel Steenbergen ed35c77262 Finish activity class and add tests 2019-03-17 17:53:00 +01:00
Merel Steenbergen e79280e470 Some more work done on the feature object 2019-03-17 17:50:56 +01:00
Merel Steenbergen 5f4069fcad Add outline of activity class, has bugs 2019-03-17 17:50:21 +01:00
Merel Steenbergen dc6682d7fa Finish activity class and add tests 2019-03-17 17:46:53 +01:00
Merel Steenbergen 922f8b2657 Some more work done on the feature object 2019-03-17 17:43:45 +01:00
Merel Steenbergen 249b40572e Add outline of activity class, has bugs 2019-03-17 17:26:31 +01:00
Merel Steenbergen dc5ddfa90e Merge branch 'AddFeatureClass' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into AddFeatureClass 2019-03-17 17:17:15 +01:00
Merel Steenbergen a80aaf3a59 Finish activity class and add tests 2019-03-17 17:15:41 +01:00
Merel Steenbergen 454a0ec1a3 Some more work done on the feature object 2019-03-17 17:15:41 +01:00
Merel Steenbergen 82d3f08e2d Fix bugs. Feature abstract class added 2019-03-17 17:15:41 +01:00
Merel Steenbergen 72c8a213a1 Add outline of activity class, has bugs 2019-03-17 17:15:41 +01:00
Merel Steenbergen 34d098f188 Finish activity class and add tests 2019-03-17 16:57:09 +01:00
Merel Steenbergen 8bbe3f0fe9 Some more work done on the feature object 2019-03-14 15:08:49 +01:00
Merel Steenbergen cca49bc9d6 Fix bugs. Feature abstract class added 2019-03-14 14:31:38 +01:00
Merel Steenbergen cea68e93c9 Add outline of activity class, has bugs 2019-03-14 14:04:04 +01:00
Merel Steenbergen d902c7401d Add score for vegetarian meal.md 2019-03-11 14:40:55 +00:00
Merel Steenbergen bbc7794e6b Add chair and secretary.md 2019-03-11 14:06:56 +00:00
Merel Steenbergen d8b51922ac Update 20190311_agenda.md 2019-03-11 14:05:00 +00:00
Merel Steenbergen 6d0bcaeb5c Update 20190311_agenda.md 2019-03-11 14:04:26 +00:00