Commit Graph

134 Commits

Author SHA1 Message Date
Sem van der Hoeven
5b84f43c72 Delete .project 2019-02-27 08:27:15 +00:00
Sem van der Hoeven
9e5a90215b Add .gitlab-ci.yml 2019-02-27 08:22:12 +00:00
Ceren U_urlu
c29d391bcb Merge branch 'revert-4d09f82a' into 'master'
Revert "Merge branch 'master' of...

See merge request cse1105/2018-2019/oopp-group-43/template!1
2019-02-26 07:58:50 +00: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
cugurlu
450eb45838 Upload notes 25-02-2019 2019-02-26 08:49:47 +01:00
Sem van der Hoeven
651dd6cf39 Update 20190225_agenda.md 2019-02-25 15:22:34 +00:00
cugurlu
1478cad2b2 updateClientServer 2019-02-25 16:10:41 +01:00
Sem van der Hoeven
b52319380b small update to gitignore, it should now exclude the .gradle and .idea folders in the client and server folder 2019-02-25 16:02:04 +01:00
Sem van der Hoeven
10cbf84cde Update 20190225_agenda.md 2019-02-25 14:59:00 +00:00
Sem van der Hoeven
f0d30fa3e8 Update 20190225_agenda.md 2019-02-25 14:47:47 +00:00
Sem van der Hoeven
42b493c9ea Update 20190225_agenda.md 2019-02-25 14:25:18 +00:00
Sem van der Hoeven
09f5492e57 Update 20190225_agenda.md 2019-02-25 14:17:32 +00:00
Sem van der Hoeven
d7da1944fb Update 20190225_agenda.md 2019-02-25 14:14:58 +00:00
Sem van der Hoeven
115402896a Added a few comments to server java files 2019-02-25 07:59:10 +01:00
Sem van der Hoeven
bbaa0c4ada Added a general overview of the API's and frameworks we've come across 2019-02-25 07:52:56 +01:00
Sem van der Hoeven
05d5a5495b added gitignore to server folder 2019-02-24 13:22:54 +01:00
cugurlu
0d65b59455 Client side is added 2019-02-22 13:37:00 +01:00
Sem van der Hoeven
62a64c5b2a Updated agenda with points from meetup on 22-2-2019 2019-02-22 13:30:44 +01:00
cugurlu
0becc32b49 Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template 2019-02-22 13:28:21 +01:00
Daan Sneep
e29fa7badd Removed the test "Hello World" 2019-02-22 13:23:45 +01:00
cugurlu
2b24b067f5 Server side is added 2019-02-22 13:22:50 +01:00
Sem van der Hoeven
3b63b33643 Updated the agenda for meeting 25-02 2019-02-22 07:27:15 +01:00
Sem van der Hoeven
56c7eda8c6 Merge branch 'Hello_World_Testing' 2019-02-20 22:56:24 +01:00
Sem van der Hoeven
890dd979fc Added agenda for meeting 2 (25 feb) 2019-02-20 22:53:13 +01:00
Sem van der Hoeven
e6b543a4f8 Merge commit '3f2d58875de6f3bf6cf638f1ee6d0e845b715095' into Hello_World_Testing 2019-02-19 14:53:48 +01:00
Daan Sneep
1331222b65 The agenda from our first project meeting (18/02/2019) 2019-02-19 11:28:12 +00: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
Sem van der Hoeven
e466033b10 updated gitignore file with gitignore.io. commented out the part that was already there 2019-02-18 16:33:17 +01:00
Sem van der Hoeven
fd350cf9bb Added javafx part to main client test, instructions are in comments in the code 2019-02-18 16:20:46 +01:00
Kristin Peneva
8dc5c14b83 Upload Screen #2 2019-02-18 13:58:36 +00:00
Kristin Peneva
e5bd8afece Upload Screen #1 2019-02-18 13:58:16 +00:00
Mika Wauben
54621b3b51 Possible GUI 2019-02-18 13:57:31 +00:00
Mika Wauben
84b60f4eb5 Delete GUI.pdn 2019-02-18 13:56:40 +00:00
Mika Wauben
780dc0e439 Possible GUI 2019-02-18 13:56:11 +00:00
Daan Sneep
3cd673b59e Additional XML files 2019-02-18 14:27:56 +01:00
Daan Sneep
5a21b51d38 Some additional xml files 2019-02-18 14:26:08 +01:00
Daan Sneep
1ae2ebf334 This is a small test to make sure everyone can access this project 2019-02-18 14:16:23 +01:00
Sem van der Hoeven
7b1c5e8beb SourceTree check 2019-02-18 13:20:20 +01:00
Sem van der Hoeven
b0f7a56ffe fixed small spelling error 2019-02-18 12:03:49 +01:00
Sem van der Hoeven
dd8318b545 Added general idea of how the interface might look 2019-02-18 12:01:10 +01:00
Daan Sneep
f4b7079505 Quick text fix 2019-02-18 08:59:56 +00:00
Daan Sneep
c7266b07f3 Quick overview of what needs to be in our application 2019-02-18 08:58:56 +00:00
Daan Sneep
cbebab6e1c New directory containing project specifics and requirements 2019-02-18 08:40:56 +00:00
Kristin Peneva
15275f8614 Update README.md 2019-02-15 15:22:38 +00:00
Kristin Peneva
f45c2609b8 Upload New File 2019-02-15 15:11:42 +00:00
Mika Wauben
462c5c6aac Replace README.md 2019-02-15 11:07:56 +00:00
Mika Wauben
12171ee27f Replace README.md 2019-02-15 11:04:30 +00:00