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

308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ceren Ugurlu
0d0b78f6d0 Update Application.java 2019-03-17 16:13:05 +00:00
cugurlu
07c76dd385 Fix checkstyle errors 2019-03-17 17:08:46 +01:00
cugurlu
f5fa03b104 Add checkstyle plugin 2019-03-17 17:06:50 +01:00
Merel Steenbergen
34d098f188 Finish activity class and add tests 2019-03-17 16:57:09 +01:00
Sem van der Hoeven
b1ab9f4e8a Merge branch 'fix_userTest' into 'master' 
FIX:: fixed the userTest

See merge request cse1105/2018-2019/oopp-group-43/template!20
 2019-03-17 15:38:58 +00:00
Sem van der Hoeven
b5defaa581 FIX:: fixed the userTest 
ADD:: added equals, tostring and hashcode methods

ADD:: added equals method test
 2019-03-17 16:23:52 +01:00
Sem van der Hoeven
e1448055f5 ADD::Added checkstyle comments 
FIX::fixed some checkstyle warnings
 2019-03-17 15:58:55 +01:00
Sem van der Hoeven
4306372a61 Merge branch 'fix_master' into 'master' 
Merge fix_master branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!18
 2019-03-17 14:47:44 +00:00
cugurlu
a605e1a92e Update changes 2019-03-17 15:19:43 +01:00
Sem van der Hoeven
e718e3859b removed .idea folder 2019-03-17 14:32:57 +01:00
Sem van der Hoeven
50c58da035 Update .gitignore 
added that it excludes the .idea directory from the src folder
 2019-03-17 13:31:26 +00:00
Ceren Ugurlu
c23344e8ef Revert "Merge branch 'master' into 'vegetarian_meal'" 
This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f
 2019-03-17 13:24:32 +00:00
Sem van der Hoeven
a817d9118a ADD::added buttons and counters for the various activities 
they don't have functionality yet, but they are already placed

ADD::added methods to get the name of  the user
 2019-03-17 14:16:29 +01:00
Sem van der Hoeven
fb6dfcdd20 Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 2019-03-17 13:11:00 +01:00
Sem van der Hoeven
7539dd20f6 EDIT::changed GUI name to greenify 2019-03-17 13:09:27 +01: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
cugurlu
4b702bc63b Add configurations for basic authentication 2019-03-16 22:43:30 +01:00
Sem van der Hoeven
5a62ef18dd Merge branch 'Add_registering_GUI' into 'master' 
merge registering GUI branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!15
 2019-03-16 19:35:55 +00:00
Sem van der Hoeven
0fb1991240 Merge branch 'master' into 'Add_registering_GUI' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/Application.java
#   src/Client/src/main/java/greenify/client/controller/UserController.java
#   src/Client/src/main/resources/stylesheets/dashboardStyle.css
 2019-03-16 17:40:58 +00:00
Sem van der Hoeven
592015b1cd ADD::Added GUI for the registering 
added a window to the sign up button, registering still gives an exception?
 2019-03-16 18:37:23 +01:00
Sem van der Hoeven
9a294930d8 Merge branch 'database_fixes' into 'master' 
Merge database_fixes branch into master

See merge request cse1105/2018-2019/oopp-group-43/template!14
 2019-03-16 13:50:44 +00:00
Sem van der Hoeven
33c09581ec Merge branch 'fix_ci_building' into 'master' 
merge fix_ci_building into master

See merge request cse1105/2018-2019/oopp-group-43/template!13
 2019-03-16 13:50:29 +00:00
Ceren Ugurlu
7fb44f6867 Delete ApplicationTest.java 2019-03-16 13:34:12 +00:00
Ceren Ugurlu
98df90b0b2 Delete UserJpaRepository.java 2019-03-16 13:27:07 +00:00
Ceren Ugurlu
80d5e42c00 Update build.gradle 2019-03-16 13:25:01 +00:00
cugurlu
4b9e6fce66 Update changes 2019-03-16 14:21:38 +01:00
Sem van der Hoeven
9ff1eb6b09 ADD:: added image to add activity button 2019-03-16 14:20:40 +01:00
cugurlu
479ed8e7f2 Add new tests 2019-03-16 14:18:40 +01:00
cugurlu
59c84f2c09 Add new classes for database 2019-03-16 14:17:35 +01:00