sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
287 Commits 4 Branches 6 Tags
f018484556489dfb300bbb7f545c755f50f1fdf0
Commit Graph

287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sem van der Hoeven
6945eddf5d Merge branch 'Get_UserControllerTest_Working' 
# Conflicts:
#	src/Server/src/test/java/UserControllerTest.java
 2019-03-18 12:20:44 +01:00
Sem van der Hoeven
3e5957b807 EDIT::commented out usercontrollertest, as it is still not working, but want to merge this branch to get the gui properly 2019-03-18 12:10:43 +01:00
Sem van der Hoeven
f66191f136 Merge branch 'Add_tests' into 'master' 
Merge Add_tests branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!28
 2019-03-17 23:39:20 +00: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
Sem van der Hoeven
3c5bc0a651 FIX::fixed the fxml Label names 
there were exceptions when trying to add a vegetarian meal, this was caused by the method not accessing the right label to change
 2019-03-17 22:14:27 +01:00
Sem van der Hoeven
aa393da53b FIX::fixed FXML declarations under fields 2019-03-17 22:05:29 +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
Sem van der Hoeven
282d2026ba FIX::fixed UserDto names 
ADD::tried to add second test to see what was the problem, but no luck so far
 2019-03-17 21:42:52 +01:00
Ceren Ugurlu
874b0bcd72 Merge branch 'add_documents' into 'master' 
Merge add_documents branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!27
 2019-03-17 20:12:33 +00:00
cugurlu
a9e659fc9f Add checkstyle screenshot 2019-03-17 21:04:24 +01:00
cugurlu
2c3314c693 Add week 5 agenda 2019-03-17 21:01:36 +01:00
Ceren Ugurlu
8524bb2e89 Update .gitlab-ci.yml 2019-03-17 19:13:47 +00:00
Ceren Ugurlu
8a4134c52b Update .gitlab-ci.yml 2019-03-17 18:46:17 +00:00
Sem van der Hoeven
b0e2ad2903 ADD::added checkstyle file 
it somehow got deleted
 2019-03-17 19:25:50 +01:00
Sem van der Hoeven
8c13a8bf39 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-03-17 19:23:32 +01:00
Sem van der Hoeven
01b4ac4287 FIX::Corrected the UserDto name change in Userservice of server 
the references were still to UserDTO instead of the new UserDto
 2019-03-17 19:22:59 +01:00
Ceren Ugurlu
4fa6ac7f53 Merge branch 'FixDTO' into 'master' 
Merge FixDTO into master

See merge request cse1105/2018-2019/oopp-group-43/template!26
 2019-03-17 18:01:55 +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
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
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
Sem van der Hoeven
ec63a64248 Merge branch 'checkstyle' into 'master' 
Merge checkstyle branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!24
 2019-03-17 16:33:48 +00:00
Ceren Ugurlu
5b13f26dee Update UserDTOTest.java 2019-03-17 16:30:41 +00:00
Ceren Ugurlu
561cca7f5a Update UserDTO.java 2019-03-17 16:29:56 +00:00
cugurlu
20b6e89781 Fix checkstyle errors 2019-03-17 17:27:29 +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