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

375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cugurlu
928c6f89a6 Edit common classes 2019-03-16 14:16:29 +01:00
cugurlu
20735380e5 Edit client classes 2019-03-16 14:14:17 +01:00
cugurlu
31499adc00 Add application.properties 2019-03-16 14:10:22 +01:00
cugurlu
2b04ce2306 Fix build.gradle files 2019-03-16 14:06:46 +01:00
Sem van der Hoeven
ad4e49f65c Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template 
Sourcetree needed to merge this?
 2019-03-14 19:26:17 +01:00
Sem van der Hoeven
e9bee87a38 FIX::edited correct names in fxml files 
changed the controller names to use the greenify packages

ADD::added button to add a vegetarian meal

only the button
 2019-03-14 19:23:30 +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
Ceren Ugurlu
c07ea93176 Update build.gradle 2019-03-14 12:48:32 +00:00
cugurlu
a5b4a2e8f0 Update build.gradle in common 2019-03-14 13:43:03 +01:00
cugurlu
f959ffc066 Fix fxml files 2019-03-14 13:41:32 +01:00
mlwauben
ed1af0ebbc Merge branch 'changeDoc' 2019-03-14 13:27:29 +01: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
cugurlu
80bc87922c Update build.gradle in common 2019-03-14 12:05:41 +01:00
Mika Wauben
aa448506d7 ADD: sprint1 review 2019-03-14 10:45:27 +00:00
Sem van der Hoeven
0be9322f66 EDIT:: Update .gitignore 
it should keep the build directory in Client, as that's where the ci reports are saved
 2019-03-14 10:07:52 +00:00
Sem van der Hoeven
25758cfbd2 EDIT::Update .gitlab-ci.yml 
changed image to thijsray/java8-javafx-gradle
 2019-03-14 10:01:12 +00:00
Sem van der Hoeven
a265c286eb FIX::fixed package names and imports 
changed gogreen to greenify

FIX::made user tostring test succeed

added toString method to user
 2019-03-12 22:53:43 +01:00
cugurlu
d02393400e Fix names of directories 2019-03-12 10:27:30 +01:00
cugurlu
7548df160d Add tests for server 2019-03-12 10:22:07 +01:00
cugurlu
a9827b8573 Add client test 2019-03-12 10:18:34 +01:00
Sem van der Hoeven
5877e307d5 ADD:: added javadoc comments where needed for the checkstyle 
EDIT:: edited some lines to fit the checkstyle

fixed some indentation warnings and line length warnings
 2019-03-11 16:44:55 +01:00
Sem van der Hoeven
ece58798f1 REMOVE::removed GoGreen folder 2019-03-11 16:11:09 +01:00
Sem van der Hoeven
7e529f5608 ADD::added meeting notes for meeting 5 2019-03-11 16:06:06 +01:00
Sem van der Hoeven
29229e457c Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'"" 
This reverts commit 7af5470a8e.
 2019-03-11 16:03:00 +01:00
Sem van der Hoeven
7af5470a8e Revert "MERGE::Merge branch 'fix_gradle_build_file'" 
This reverts commit 309337f26d, reversing
changes made to d902c7401d.
 2019-03-11 15:59:38 +01:00
Sem van der Hoeven
309337f26d MERGE::Merge branch 'fix_gradle_build_file' 
# Conflicts:
#	src/GoGreen/Client/src/test/java/UserServiceTest.java
resolved using 'Theirs'
 2019-03-11 15:48:58 +01:00