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 309337f26dd902c7401d
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
Sem van der Hoeven
aabe922f8f
ADD:: Added dashboard
...
added controller class and functionality to switch between sections
2019-03-11 14:05:26 +01:00
cugurlu
c15ba030bf
Fix client test
2019-03-11 11:50:27 +01:00
cugurlu
3681daa6f4
Add coverage report
2019-03-11 11:41:11 +01:00
Merel Steenbergen
e6e3544bb7
Merge branch 'changeDoc' into 'master'
...
Change doc
See merge request cse1105/2018-2019/oopp-group-43/template!8
2019-03-10 20:46:54 +00:00
Mika Wauben
688d2ef847
Add scrum board sprint2
2019-03-10 07:12:46 +00:00
Mika Wauben
a6e1a70448
Replace backlog_sprint2.pdf
2019-03-10 07:07:52 +00:00
Mika Wauben
987997bfb3
Add scrum board sprint1
2019-03-10 07:06:58 +00:00
Mika Wauben
bcc3295ac8
Merge branch 'ConvertToPDF' into 'master'
...
MERGE: PDF files instead of excel.
See merge request cse1105/2018-2019/oopp-group-43/template!7
2019-03-10 07:02:08 +00:00
Sem van der Hoeven
2e1becbe32
REMOVE::removed settings.gradle file in src folder
...
this messed with the paths for the main settings.gradle file
2019-03-09 14:12:44 +01:00
Sem van der Hoeven
803b0c2064
EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files.
...
maybe this fixes the pipline build failure
2019-03-09 13:40:19 +01:00
Sem van der Hoeven
fa73f6fb4d
EDIT:: Reimported project
...
reimported project to fix the errors in client application
FIX:: fixed the "location is not set" error in client application when loading fxml file
reimporting the project made it work, as it now has a submodule folder structure
EDIT:: edited settings.gradle file to include the modules in the new structure
EDIT: edited client build.gradle and server build.gradle files to pick the right common folder
(changed complie(:Common) to compile(:src:Common))
2019-03-09 13:33:15 +01:00
Merel Steenbergen
722205a24c
EDIT: Convert sprint backlog en review to pdf
2019-03-08 19:26:54 +01:00
