sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
411 Commits 4 Branches 6 Tags
e755107fa86656b76c520e33d3c65a2724ed5314
Commit Graph
85 Commits
Author SHA1 Message Date
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 97a0e38c40 FIX:: application classes server+client 2019-03-26 15:34:50 +01:00
Merel Steenbergen 4780ae7b11 Revert changes: AssertArrayEquals doesn't work on ArrayLists 2019-03-26 13:56:48 +00:00
Merel Steenbergen 1668731624 Use assertArrayEquals instead of AssertEquals 2019-03-26 13:49:29 +00: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 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
Ceren Ugurlu 5c9c1b8be5 Delete Activity.java 2019-03-25 12:36:12 +00:00
Ceren Ugurlu d7dcd95278 Delete ActivityTest.java 2019-03-25 12:34:54 +00:00
cugurlu fc7e718b21 Add new tests 2019-03-25 13:33:38 +01:00
cugurlu 8e58118ac7 Add new classes for calculator 2019-03-25 13:32:01 +01:00
cugurlu e8108498ad Update UserDto and delete addVeganMealProperty 2019-03-25 13:07:03 +01:00
cugurlu bddf984438 Clean up all unnecessary files 2019-03-21 18:07:14 +01:00
Sem van der Hoeven 292035498c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
SourceTree needed to merge this?
 2019-03-19 14:52:19 +01:00
Ceren Ugurlu 121b86a73e Merge branch 'master' into 'fixMaster' 2019-03-19 13:09:13 +00:00
Sem van der Hoeven 920c7c798d ADD::added more comments 2019-03-18 20:47:34 +01:00
Sem van der Hoeven b8f4415825 ADD::added comments to most classes to make it more understandable 2019-03-18 17:07:38 +01:00
cugurlu 563c72ffec Update branch 2019-03-18 16:56:44 +01:00
cugurlu 166945871d Fix UserService and UserServiceTest 2019-03-18 14:35:30 +01:00
cugurlu f76a6827f7 Fix tests 2019-03-18 12:15:00 +01:00
cugurlu a2e432d453 Add totalVeganMeal property and fix checkstyle errors 2019-03-18 12:14:30 +01:00
cugurlu 711b16449c Add RestExceptionHandler test 2019-03-18 00:35:29 +01:00
cugurlu d7960103ee Add UserRepository test 2019-03-18 00:34:51 +01:00
cugurlu 2546355eba Add UserController test 2019-03-18 00:34:26 +01:00
cugurlu 8864320832 Add tests 2019-03-18 00:33:59 +01:00
Ceren Ugurlu 76ebd018bd Delete UserControllerTest.java 2019-03-17 20:50:20 +00:00
Ceren Ugurlu 88e7afb8fb Update the location of ActivityTest.java 2019-03-17 20:49:01 +00:00
Ceren Ugurlu e92dd0ba2b Delete UserTest.java 2019-03-17 20:47:53 +00:00
Ceren Ugurlu e0f0e38241 Delete MainController.java 2019-03-17 20:45:22 +00:00
cugurlu 1da7f62c95 Fix the branch and add a test 2019-03-17 18:58:56 +01:00
Merel Steenbergen 0c042daa1c DTO changed to Dto. Still some errors 2019-03-17 18:31:55 +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
Sem van der Hoeven 4b77102205 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
# Conflicts:
#	src/.idea/checkstyle-idea.xml
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Client/src/main/java/greenify/client/controller/UserController.java
#	src/Client/src/main/java/greenify/client/rest/UserService.java
#	src/Server/src/main/java/greenify/server/data/repository/UserRepository.java
#	src/Server/src/main/java/greenify/server/rest/UserController.java
#	src/Server/src/main/java/greenify/server/service/UserService.java
 2019-03-17 18:02:30 +01: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
Sem van der Hoeven 09c7817eef Merge branch 'Develop_GUI_further' into master 
# Conflicts:
#	src/.idea/workspace.xml
#	src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#	src/Client/src/main/java/greenify/client/controller/UserController.java
#	src/Client/src/main/java/greenify/client/rest/UserService.java
#	src/Server/src/main/java/greenify/server/data/model/User.java
#	src/Server/src/main/java/greenify/server/data/repository/UserRepository.java
#	src/Server/src/main/java/greenify/server/rest/UserController.java
#	src/Server/src/main/java/greenify/server/service/UserService.java

resolved conflicts manually, used the ones from 'Develop_GUI_further'
 2019-03-17 17:52:25 +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
Sem van der Hoeven 2999359b01 Merge branch 'master' into 'AddFeatureClass' 
# Conflicts:
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
 2019-03-17 16:37:45 +00:00
Merel Steenbergen 249b40572e Add outline of activity class, has bugs 2019-03-17 17:26:31 +01:00