Commit Graph

Select branches

Hide Pull Requests

add/more_animations

feature/explanation

master

update/notes_week9

v0.1.0

v0.1.1

v0.2

v0.2.1

v1.0

v1.0.0

Mono Color

• 8bbe3f0fe9 Some more work done on the feature object Merel Steenbergen 2019-03-14 15:08:49 +01:00
• cca49bc9d6 Fix bugs. Feature abstract class added Merel Steenbergen 2019-03-14 14:31:38 +01:00
• cea68e93c9 Add outline of activity class, has bugs Merel Steenbergen 2019-03-14 14:04:04 +01:00
• c07ea93176 Update build.gradle Ceren Ugurlu 2019-03-14 12:48:32 +00:00
• a5b4a2e8f0 Update build.gradle in common cugurlu 2019-03-14 13:43:03 +01:00
• f959ffc066 Fix fxml files cugurlu 2019-03-14 13:41:32 +01:00
• ed1af0ebbc Merge branch 'changeDoc' mlwauben 2019-03-14 13:27:29 +01:00
• 7edd9e7ed0 ADD: sprint2 review Mika Wauben 2019-03-14 12:11:23 +00:00
• b25e9a0db2 REPLACE scrumboard sprint2 Mika Wauben 2019-03-14 12:03:34 +00:00
• a12f364df0 Delete 20191003_scrumboard.png Mika Wauben 2019-03-14 12:03:16 +00:00
• ceac07b27b REPLACE scrumboard sprint1 Mika Wauben 2019-03-14 12:02:30 +00:00
• 664a941976 Delete 20190403_scrumboard.png Mika Wauben 2019-03-14 12:02:10 +00:00
• a9c99ed678 REPLACE scrumboard sprint1 Mika Wauben 2019-03-14 12:01:52 +00:00
• 80bc87922c Update build.gradle in common cugurlu 2019-03-14 12:05:41 +01:00
• aa448506d7 ADD: sprint1 review Mika Wauben 2019-03-14 10:45:27 +00:00
• 0be9322f66 EDIT:: Update .gitignore Sem van der Hoeven 2019-03-14 10:07:52 +00:00
• 25758cfbd2 EDIT::Update .gitlab-ci.yml changed image to thijsray/java8-javafx-gradle Sem van der Hoeven 2019-03-14 10:01:12 +00:00
• a265c286eb FIX::fixed package names and imports Sem van der Hoeven 2019-03-12 22:53:43 +01:00
• d02393400e Fix names of directories cugurlu 2019-03-12 10:27:30 +01:00
• 7548df160d Add tests for server cugurlu 2019-03-12 10:22:07 +01:00
• a9827b8573 Add client test cugurlu 2019-03-12 10:18:34 +01:00
• 5877e307d5 ADD:: added javadoc comments where needed for the checkstyle Sem van der Hoeven 2019-03-11 16:44:55 +01:00
• ece58798f1 REMOVE::removed GoGreen folder Sem van der Hoeven 2019-03-11 16:11:09 +01:00
• 7e529f5608 ADD::added meeting notes for meeting 5 Sem van der Hoeven 2019-03-11 16:06:06 +01:00
• 29229e457c Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'"" Sem van der Hoeven 2019-03-11 16:03:00 +01:00
• 7af5470a8e Revert "MERGE::Merge branch 'fix_gradle_build_file'" Sem van der Hoeven 2019-03-11 15:59:38 +01:00
• 309337f26d MERGE::Merge branch 'fix_gradle_build_file' Sem van der Hoeven 2019-03-11 15:48:58 +01:00
• d902c7401d Add score for vegetarian meal.md Merel Steenbergen 2019-03-11 14:40:55 +00:00
• cd7f5b390b ADD::added titles to the pages from the GUI Sem van der Hoeven 2019-03-11 15:40:16 +01:00
• bbc7794e6b Add chair and secretary.md Merel Steenbergen 2019-03-11 14:06:56 +00:00
• d8b51922ac Update 20190311_agenda.md Merel Steenbergen 2019-03-11 14:05:00 +00:00
• 6d0bcaeb5c Update 20190311_agenda.md Merel Steenbergen 2019-03-11 14:04:26 +00:00
• c35d5d76bc Delete 03112019_Agenda Merel Steenbergen 2019-03-11 14:03:26 +00:00
• cfa7717bea Update agenda_03112019 Merel Steenbergen 2019-03-11 14:02:52 +00:00
• 909f9a6dd1 Add new file Merel Steenbergen 2019-03-11 14:02:17 +00:00
• 6df15465e7 Merge branch 'changeDoc' into 'master' Sem van der Hoeven 2019-03-11 13:52:35 +00:00
• c5c34e17dc Checkstyle screenshot uploaded Daan Sneep 2019-03-11 13:46:39 +00:00
• a231b7374d ADD::tried to add application plugin to build.gradle Sem van der Hoeven 2019-03-11 14:42:06 +01:00
• b4c3f3644a Add some CO2 emmission scores and good sources to find information Merel Steenbergen 2019-03-11 13:40:11 +00:00
• c0fdb466d5 Merge branch 'changeDoc' into 'master' Mika Wauben 2019-03-11 13:37:18 +00:00
• dff3cffb00 Merge branch 'addBacklogSprint2' into 'master' Merel Steenbergen 2019-03-11 13:36:39 +00:00
• 60907b30f7 Add backlog sprint3 Mika Wauben 2019-03-11 13:21:43 +00:00
• dc5534ae34 Add retrospective sprint2 Mika Wauben 2019-03-11 13:12:50 +00:00
• 2a0210326e Add new directory Mika Wauben 2019-03-11 13:06:13 +00:00
• aabe922f8f ADD:: Added dashboard Sem van der Hoeven 2019-03-11 14:05:26 +01:00
• c15ba030bf Fix client test cugurlu 2019-03-11 11:50:27 +01:00
• 3681daa6f4 Add coverage report cugurlu 2019-03-11 11:41:11 +01:00
• e6e3544bb7 Merge branch 'changeDoc' into 'master' Merel Steenbergen 2019-03-10 20:46:54 +00:00
• 688d2ef847 Add scrum board sprint2 Mika Wauben 2019-03-10 07:12:46 +00:00
• a6e1a70448 Replace backlog_sprint2.pdf Mika Wauben 2019-03-10 07:07:52 +00:00
• 987997bfb3 Add scrum board sprint1 Mika Wauben 2019-03-10 07:06:58 +00:00
• bcc3295ac8 Merge branch 'ConvertToPDF' into 'master' v1.0 v0.1.0 Mika Wauben 2019-03-10 07:02:08 +00:00
• 2e1becbe32 REMOVE::removed settings.gradle file in src folder Sem van der Hoeven 2019-03-09 14:12:44 +01:00
• 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 Sem van der Hoeven 2019-03-09 13:40:19 +01:00
• fa73f6fb4d EDIT:: Reimported project Sem van der Hoeven 2019-03-09 13:33:15 +01:00
• 722205a24c EDIT: Convert sprint backlog en review to pdf Merel Steenbergen 2019-03-08 19:26:54 +01:00
• cab6d9aeeb FIX:: fixed Client application class Sem van der Hoeven 2019-03-07 20:46:51 +01:00
• aa79365784 apparently the changes that were supposed to be made weren't committed in my previous commit, so here is the right one Sem van der Hoeven 2019-03-06 21:22:29 +01:00
• 7a60ecb60f REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders Sem van der Hoeven 2019-03-06 21:20:09 +01:00
• 7b1dc88653 REMOVE:: removed the .idea and .gradle files from the GoGreen subfolders Sem van der Hoeven 2019-03-06 16:07:26 +01:00
• 7bdd47ba90 ADD::added .gitlab-ci.yml Sem van der Hoeven 2019-03-06 14:06:08 +00:00
• 8b94c80ca0 Merge branch 'cleanUpRepository' Sem van der Hoeven 2019-03-06 15:01:11 +01:00
• 5b802068ab MOVE::moved GoGreen folder into src folder Sem van der Hoeven 2019-03-06 14:53:22 +01:00
• 5b802ea980 Replace backlog_sprint2.pdf Mika Wauben 2019-03-06 11:22:08 +00:00
• fc3b750348 Replace backlog_sprint2 Mika Wauben 2019-03-06 11:17:50 +00:00
• 584a373284 Delete backlog_sprint2.xlsx Mika Wauben 2019-03-06 11:17:28 +00:00
• 0b244ebc00 Replace backlog_sprint2.xlsx Mika Wauben 2019-03-06 11:16:08 +00:00
• 3b180893c7 Update doc_meetings_20190311_agenda.md Merel Steenbergen 2019-03-06 11:08:21 +00:00
• 9e3128d4a0 Update doc_meetings_20190311_agenda.md Merel Steenbergen 2019-03-06 10:55:03 +00:00
• 85ddd2b787 Update doc_meetings_20190311_agenda.md Merel Steenbergen 2019-03-06 10:54:43 +00:00
• 5c63e701e8 Upload agenda 11-03-2019 Merel Steenbergen 2019-03-06 10:53:29 +00:00
• 36a7faf052 Delete docx file, md file is sufficient Merel Steenbergen 2019-03-06 11:37:28 +01:00
• c741e07a79 Merge branch 'Delete_OOPPbeginnging_directory' into 'master' Merel Steenbergen 2019-03-06 10:24:10 +00:00
• 91cc14f1b0 Merge branch 'Delete_OOPPbeginnging_directory' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Delete_OOPPbeginnging_directory Merel Steenbergen 2019-03-06 11:19:42 +01:00
• 1408f5da6a Deleted directory OOPP 43 in the beginning. Merel Steenbergen 2019-03-06 11:18:24 +01:00
• f994a8b948 Notes week 4 Daan Sneep 2019-03-06 10:17:07 +00:00
• 3dc679983a FIX:: changed project name in gradle settings from OOP Project to OOPP Sem van der Hoeven 2019-03-06 11:08:02 +01:00
• 7953d50409 ADD::Added build.gradle file in root Sem van der Hoeven 2019-03-06 10:53:59 +01:00
• 0f169bc7a7 DELETE: gradle folder root mlwauben 2019-03-04 20:06:39 +01:00
• 58fb40d98a Merge commit 'da2d08a27988a3e25aa264004101c0084af9052b' into cleanUpRepository mlwauben 2019-03-04 19:53:26 +01:00
• 9c5f9146a3 DELETE: pom .yml .iml mlwauben 2019-03-04 19:43:16 +01:00
• b68badb484 Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template cugurlu 2019-03-04 18:01:58 +01:00
• da2d08a279 Update client server cugurlu 2019-03-04 17:54:50 +01:00
• cd4fa3cf99 FIX: README.md mlwauben 2019-03-04 17:39:29 +01:00
• 5a0bd855c2 Merge branch 'updateCientServer' into 'master' Ceren Ugurlu 2019-03-04 16:08:47 +00:00
• dfc797fab2 DELETE: template files src mlwauben 2019-03-04 17:03:08 +01:00
• 5c314e22d4 FIX: layout doc mlwauben 2019-03-04 17:00:59 +01:00
• a93529faf5 Add coverage report cugurlu 2019-03-04 16:23:04 +01:00
• fda867e254 Merge branch 'fix/postmeeting' into 'master' Mika Wauben 2019-03-04 15:21:39 +00:00
• c2eadd7bd6 Update 20190304_agenda.md Mika Wauben 2019-03-04 13:44:39 +00:00
• 85e62256c1 Ceren Ugurlu estimated hours filled in Ceren Ugurlu 2019-03-04 12:58:27 +00:00
• 13b06994ce Upload New File Daan Sneep 2019-03-04 12:45:10 +00:00
• ccf71de156 Sem van der Hoeven estimated hours filled in Sem van der Hoeven 2019-03-04 12:47:10 +01:00
• a748bab7e1 no message cugurlu 2019-03-04 12:43:53 +01:00
• f3ecf2a3c6 Delete backlog_sprint1.xlsx Daan Sneep 2019-03-04 11:30:44 +00:00
• 302057f277 sprint1 Daan Sneep estimated hours filled in Daan Sneep 2019-03-04 11:30:31 +00:00
• 302a7d8d9e Merge branch 'Development' Sem van der Hoeven 2019-03-04 11:57:15 +01:00
• aa10858e52 Upload backlog sprint2 Mika Wauben 2019-03-04 10:47:40 +00:00
• d71d00f050 Upload backlog sprint1 Mika Wauben 2019-03-04 10:20:19 +00:00
• 1597536a93 Upload retrospective sprint1 Mika Wauben 2019-03-04 10:19:43 +00:00