Commit Graph

116 Commits

Author SHA1 Message Date
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
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
cugurlu
3681daa6f4 Add coverage report 2019-03-11 11:41:11 +01: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
Merel Steenbergen
722205a24c EDIT: Convert sprint backlog en review to pdf 2019-03-08 19:26:54 +01:00
Sem van der Hoeven
8b94c80ca0 Merge branch 'cleanUpRepository'
# Conflicts:
#	src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties

Conflicts resolved using 'Theirs'
2019-03-06 15:01:11 +01:00
Mika Wauben
5b802ea980 Replace backlog_sprint2.pdf 2019-03-06 11:22:08 +00:00
Mika Wauben
fc3b750348 Replace backlog_sprint2 2019-03-06 11:17:50 +00:00
Mika Wauben
584a373284 Delete backlog_sprint2.xlsx 2019-03-06 11:17:28 +00:00
Mika Wauben
0b244ebc00 Replace backlog_sprint2.xlsx 2019-03-06 11:16:08 +00:00
Merel Steenbergen
3b180893c7 Update doc_meetings_20190311_agenda.md 2019-03-06 11:08:21 +00:00
Merel Steenbergen
9e3128d4a0 Update doc_meetings_20190311_agenda.md 2019-03-06 10:55:03 +00:00
Merel Steenbergen
85ddd2b787 Update doc_meetings_20190311_agenda.md 2019-03-06 10:54:43 +00:00
Merel Steenbergen
5c63e701e8 Upload agenda 11-03-2019 2019-03-06 10:53:29 +00:00
Merel Steenbergen
36a7faf052 Delete docx file, md file is sufficient 2019-03-06 11:37:28 +01:00
Daan Sneep
f994a8b948 Notes week 4 2019-03-06 10:17:07 +00:00
Ceren Ugurlu
5a0bd855c2 Merge branch 'updateCientServer' into 'master'
User Registration

See merge request cse1105/2018-2019/oopp-group-43/template!4
2019-03-04 16:08:47 +00:00
mlwauben
5c314e22d4 FIX: layout doc 2019-03-04 17:00:59 +01:00
cugurlu
a93529faf5 Add coverage report 2019-03-04 16:23:04 +01:00
Mika Wauben
c2eadd7bd6 Update 20190304_agenda.md 2019-03-04 13:44:39 +00:00
Ceren Ugurlu
85e62256c1 Ceren Ugurlu estimated hours filled in 2019-03-04 12:58:27 +00:00
Daan Sneep
13b06994ce Upload New File 2019-03-04 12:45:10 +00:00
Sem van der Hoeven
ccf71de156 Sem van der Hoeven estimated hours filled in 2019-03-04 12:47:10 +01:00
Daan Sneep
f3ecf2a3c6 Delete backlog_sprint1.xlsx 2019-03-04 11:30:44 +00:00
Daan Sneep
302057f277 sprint1 Daan Sneep estimated hours filled in 2019-03-04 11:30:31 +00:00
Mika Wauben
aa10858e52 Upload backlog sprint2 2019-03-04 10:47:40 +00:00
Mika Wauben
d71d00f050 Upload backlog sprint1 2019-03-04 10:20:19 +00:00
Mika Wauben
1597536a93 Upload retrospective sprint1 2019-03-04 10:19:43 +00:00
cugurlu
e09e8e2ef7 Add Client, Server, Common 2019-03-04 10:18:36 +01:00
Daan Sneep
da818e64b0 Update score.md 2019-03-04 08:54:01 +00:00
Daan Sneep
14ba6b9a3e Update score.md 2019-03-04 08:48:42 +00:00
Daan Sneep
06fd497f7c Update score.md 2019-03-04 08:45:01 +00:00
Daan Sneep
3614305f38 Markdown translation of word document 2019-03-04 08:42:19 +00:00
mlwauben
57bc183d40 Add score schema+register ideas 2019-03-02 11:00:57 +01:00
Mika Wauben
87ffd45a14 Clean up 'project details' 2019-03-02 09:49:27 +00:00
Mika Wauben
0a6378491d Replace 20190304_agenda.md 2019-03-02 08:59:54 +00:00
mlwauben
bd9fed6fd2 Add agenda 04-03-2019 2019-03-02 09:54:42 +01:00
cugurlu
b63049d502 Clean up the directory 2019-02-27 21:46:16 +01:00
Ceren U_urlu
43ace24fa7 Revert "Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template"
This reverts commit 4d09f82aec
2019-02-26 07:56:07 +00:00
cugurlu
4d09f82aec Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template 2019-02-26 08:51:10 +01:00