 Merel Steenbergen
|
698c6ef7fd
|
Delete Daan from README
|
2019-03-25 15:28:53 +00:00 |
|
|
Merel Steenbergen
|
4be4853685
|
Delete corequadrant-KP.png
|
2019-03-25 15:27:36 +00:00 |
|
|
Merel Steenbergen
|
36c67ce217
|
Delete KristinPeneva.jpg
|
2019-03-25 15:27:20 +00:00 |
|
|
Merel Steenbergen
|
cb15a1fefe
|
Delete Daan_Sneep_PDP_Core_Quadrant.PNG
|
2019-03-25 15:27:11 +00:00 |
|
|
Merel Steenbergen
|
19f4a73119
|
Delete Daan_Sneep.png
|
2019-03-25 15:27:00 +00:00 |
|
|
Merel Steenbergen
|
e494b5294d
|
Revert "Merge branch 'AddFriends' into 'master'"
This reverts merge request !37
|
2019-03-23 17:31:00 +00:00 |
|
|
Merel Steenbergen
|
f8315700d9
|
FIX: Uncomment mainClassName
|
2019-03-22 21:57:05 +01:00 |
|
|
Merel Steenbergen
|
6385beec06
|
FIX: Tests now work
|
2019-03-22 21:51:09 +01:00 |
|
|
Merel Steenbergen
|
12c2ebab4e
|
Debugging in progress. FindByName returns null again.
|
2019-03-22 20:20:39 +01:00 |
|
|
Merel Steenbergen
|
e69e08ad15
|
EDIT: Try to fix server, again
|
2019-03-22 18:44:59 +01:00 |
|
|
Merel Steenbergen
|
6323fd06eb
|
FIX: Bug fixed, Server now works again
|
2019-03-21 16:14:50 +01:00 |
|
|
Merel Steenbergen
|
fb69ec280d
|
Added testing for the friend list and equals in User class in Server
|
2019-03-21 16:09:23 +01:00 |
|
|
Merel Steenbergen
|
b3a0ddaa68
|
Retry adding friends. Server down again
|
2019-03-20 15:44:47 +01:00 |
|
|
Merel Steenbergen
|
0c042daa1c
|
DTO changed to Dto. Still some errors
|
2019-03-17 18:31:55 +01:00 |
|
|
Merel Steenbergen
|
bfc9595d21
|
Changed DTO files to Dto because of checkstyle
|
2019-03-17 18:23:18 +01:00 |
|
|
Merel Steenbergen
|
dd74a97c47
|
Merge branch 'AddFeatureClass' into 'master'
Add feature class
See merge request cse1105/2018-2019/oopp-group-43/template!25
|
2019-03-17 17:10:37 +00:00 |
|
|
Merel Steenbergen
|
018a164723
|
Fixed tests
|
2019-03-17 18:01:59 +01:00 |
|
|
Merel Steenbergen
|
061a6fc957
|
Delete useless file
|
2019-03-17 17:57:18 +01:00 |
|
|
Merel Steenbergen
|
ba98b30776
|
Fix merge conflicts
|
2019-03-17 17:54:24 +01:00 |
|
|
Merel Steenbergen
|
ed35c77262
|
Finish activity class and add tests
|
2019-03-17 17:53:00 +01:00 |
|
|
Merel Steenbergen
|
e79280e470
|
Some more work done on the feature object
|
2019-03-17 17:50:56 +01:00 |
|
|
Merel Steenbergen
|
5f4069fcad
|
Add outline of activity class, has bugs
|
2019-03-17 17:50:21 +01:00 |
|
|
Merel Steenbergen
|
dc6682d7fa
|
Finish activity class and add tests
|
2019-03-17 17:46:53 +01:00 |
|
|
Merel Steenbergen
|
922f8b2657
|
Some more work done on the feature object
|
2019-03-17 17:43:45 +01:00 |
|
|
Merel Steenbergen
|
249b40572e
|
Add outline of activity class, has bugs
|
2019-03-17 17:26:31 +01:00 |
|
|
Merel Steenbergen
|
dc5ddfa90e
|
Merge branch 'AddFeatureClass' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into AddFeatureClass
|
2019-03-17 17:17:15 +01:00 |
|
|
Merel Steenbergen
|
a80aaf3a59
|
Finish activity class and add tests
|
2019-03-17 17:15:41 +01:00 |
|
|
Merel Steenbergen
|
454a0ec1a3
|
Some more work done on the feature object
|
2019-03-17 17:15:41 +01:00 |
|
|
Merel Steenbergen
|
82d3f08e2d
|
Fix bugs. Feature abstract class added
|
2019-03-17 17:15:41 +01:00 |
|
|
Merel Steenbergen
|
72c8a213a1
|
Add outline of activity class, has bugs
|
2019-03-17 17:15:41 +01:00 |
|
|
Merel Steenbergen
|
34d098f188
|
Finish activity class and add tests
|
2019-03-17 16:57:09 +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 |
|
|
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 |
|
|
Merel Steenbergen
|
b4c3f3644a
|
Add some CO2 emmission scores and good sources to find information
|
2019-03-11 13:40:11 +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 |
|
|
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 |
|
|
Merel Steenbergen
|
722205a24c
|
EDIT: Convert sprint backlog en review to pdf
|
2019-03-08 19:26:54 +01: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 |
|
|
Merel Steenbergen
|
99222f15ff
|
Upload notes 18-02-2019
|
2019-02-18 16:32:57 +00:00 |
|
|
Merel Steenbergen
|
612f3a723e
|
Delete 20190218_notes.docx
|
2019-02-18 16:30:52 +00:00 |
|
|
Merel Steenbergen
|
3f2d58875d
|
Upload New File
|
2019-02-18 16:30:32 +00:00 |
|
|
Merel Steenbergen
|
240ea0c8b4
|
Fix picture and core quadrant Merel
|
2019-02-14 14:53:17 +00:00 |
|
|
Merel Steenbergen
|
7cfa856806
|
Add picture and core quadrant Merel
|
2019-02-14 14:51:54 +00:00 |
|
|
Merel Steenbergen
|
c1af945953
|
Update README.md
|
2019-02-14 14:49:12 +00:00 |
|
|
Merel Steenbergen
|
7be449e852
|
Update README.md
|
2019-02-14 14:48:17 +00:00 |
|
|
Merel Steenbergen
|
6b95573a5c
|
Update README.md
|
2019-02-14 14:27:21 +00:00 |
|
|
Merel Steenbergen
|
7b85ddbbfd
|
Upload New File
|
2019-02-14 14:26:35 +00:00 |
|
|
Merel Steenbergen
|
2db25aad79
|
Upload New File
|
2019-02-14 14:15:10 +00:00 |
|