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 |
|
Merel Steenbergen
|
d902c7401d
|
Add score for vegetarian meal.md
|
2019-03-11 14:40:55 +00:00 |
|
Sem van der Hoeven
|
cd7f5b390b
|
ADD::added titles to the pages from the GUI
the different pages now have titles indicating on what page you are, and switching between pages works now
|
2019-03-11 15:40:16 +01: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 |
|
Merel Steenbergen
|
c35d5d76bc
|
Delete 03112019_Agenda
|
2019-03-11 14:03:26 +00:00 |
|
Merel Steenbergen
|
cfa7717bea
|
Update agenda_03112019
|
2019-03-11 14:02:52 +00:00 |
|
Merel Steenbergen
|
909f9a6dd1
|
Add new file
|
2019-03-11 14:02:17 +00:00 |
|
Sem van der Hoeven
|
6df15465e7
|
Merge branch 'changeDoc' into 'master'
Add some CO2 emmission scores and good sources to find information to score schema
See merge request cse1105/2018-2019/oopp-group-43/template!11
|
2019-03-11 13:52:35 +00:00 |
|
Daan Sneep
|
c5c34e17dc
|
Checkstyle screenshot uploaded
|
2019-03-11 13:46:39 +00:00 |
|
Sem van der Hoeven
|
a231b7374d
|
ADD::tried to add application plugin to build.gradle
|
2019-03-11 14:42:06 +01:00 |
|
Merel Steenbergen
|
b4c3f3644a
|
Add some CO2 emmission scores and good sources to find information
|
2019-03-11 13:40:11 +00:00 |
|
Mika Wauben
|
c0fdb466d5
|
Merge branch 'changeDoc' into 'master'
Change doc
See merge request cse1105/2018-2019/oopp-group-43/template!10
|
2019-03-11 13:37:18 +00:00 |
|
Merel Steenbergen
|
dff3cffb00
|
Merge branch 'addBacklogSprint2' into 'master'
Add backlog sprint2
See merge request cse1105/2018-2019/oopp-group-43/template!9
|
2019-03-11 13:36:39 +00:00 |
|
Mika Wauben
|
60907b30f7
|
Add backlog sprint3
|
2019-03-11 13:21:43 +00:00 |
|
Mika Wauben
|
dc5534ae34
|
Add retrospective sprint2
|
2019-03-11 13:12:50 +00:00 |
|
Mika Wauben
|
2a0210326e
|
Add new directory
|
2019-03-11 13:06:13 +00:00 |
|