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

165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Merel Steenbergen
d902c7401d Add score for vegetarian meal.md 2019-03-11 14:40:55 +00: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
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
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
v0.1.0 v1.0 		2019-03-10 07:02:08 +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
7bdd47ba90 ADD::added .gitlab-ci.yml 
added because it was deleted with merge of branch 'cleanUpRepository', but we need it for the ci
 2019-03-06 14:06:08 +00: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
Sem van der Hoeven
5b802068ab MOVE::moved GoGreen folder into src folder 
because all our code is in the src folder, the gogreen folder should be here too
 2019-03-06 14:53:22 +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
Merel Steenbergen
c741e07a79 Merge branch 'Delete_OOPPbeginnging_directory' into 'master' 
Delete directory and add notes

See merge request cse1105/2018-2019/oopp-group-43/template!6
 2019-03-06 10:24:10 +00:00
Merel Steenbergen
91cc14f1b0 Merge branch 'Delete_OOPPbeginnging_directory' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Delete_OOPPbeginnging_directory 2019-03-06 11:19:42 +01:00
Merel Steenbergen
1408f5da6a Deleted directory OOPP 43 in the beginning. 2019-03-06 11:18:24 +01:00
Daan Sneep
f994a8b948 Notes week 4 2019-03-06 10:17:07 +00:00
Sem van der Hoeven
3dc679983a FIX:: changed project name in gradle settings from OOP Project to OOPP 
Merge branch 'cleanUpRepository' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template
 2019-03-06 11:08:02 +01:00
Sem van der Hoeven
7953d50409 ADD::Added build.gradle file in root 
combined the contents of the two gradle build files into one, and put it into the root directory.

DELETE::removed pom.xml

deleted the pom.xml file, since it was used for maven and we use gradle in our project
 2019-03-06 10:53:59 +01:00
mlwauben
0f169bc7a7 DELETE: gradle folder root 2019-03-04 20:06:39 +01:00
mlwauben
58fb40d98a Merge commit 'da2d08a27988a3e25aa264004101c0084af9052b' into cleanUpRepository 
* commit 'da2d08a27988a3e25aa264004101c0084af9052b':
  Update client server
 2019-03-04 19:53:26 +01:00
mlwauben
9c5f9146a3 DELETE: pom .yml .iml 2019-03-04 19:43:16 +01:00
cugurlu
b68badb484 Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template 2019-03-04 18:01:58 +01:00
cugurlu
da2d08a279 Update client server 2019-03-04 17:54:50 +01:00
mlwauben
cd4fa3cf99 FIX: README.md 2019-03-04 17:39:29 +01: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
dfc797fab2 DELETE: template files src 2019-03-04 17:03:08 +01:00
mlwauben
5c314e22d4 FIX: layout doc 2019-03-04 17:00:59 +01:00