From b030d9d8349915b7658254c88163006fefd7ec61 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 09:15:20 -0800 Subject: [PATCH 1/9] Create ABOUT.md --- Teams/TeamShog/ABOUT.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Teams/TeamShog/ABOUT.md diff --git a/Teams/TeamShog/ABOUT.md b/Teams/TeamShog/ABOUT.md new file mode 100644 index 0000000..ebfb063 --- /dev/null +++ b/Teams/TeamShog/ABOUT.md @@ -0,0 +1,2 @@ +TeamShog +========= From f6979c4b0c6ba3001c4dbec034906a63160432bb Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 09:18:21 -0800 Subject: [PATCH 2/9] Create team.json and add me --- Teams/TeamShog/team.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Teams/TeamShog/team.json diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json new file mode 100644 index 0000000..ddd4d19 --- /dev/null +++ b/Teams/TeamShog/team.json @@ -0,0 +1,11 @@ +{ + "teamName": "TeamShog", + "members": [ + { + "name": "Noah MacDonald", + "twitter": "falkirknh", + "koding": "falkirks", + "location": "Vancouver, CA" + } + ] +} From afef11fe2c03d8a6f79ab94948c50ec1e2f64f07 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 09:30:36 -0800 Subject: [PATCH 3/9] Added incomplete data for rest of team --- Teams/TeamShog/team.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index ddd4d19..1095cef 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -6,6 +6,31 @@ "twitter": "falkirknh", "koding": "falkirks", "location": "Vancouver, CA" + }, + { + "name": "Leon", + "twitter": "99leonchang", + "koding": "", + "location": "Hsinchu, TWN" + }, + { + "name": "Samuel", + "twitter": "MegaSam_", + "koding": "", + "location": "Sydney, AU" + + }, + { + "name": "Adam", + "twitter": "TuffDev", + "koding": "", + "location": "Fishers, US" + }, + { + "name": "", + "twitter": "PEMapModder", + "koding": "", + "location": "Hong Kong, CHN" } ] } From a437c3eed0eddc1efcca7a6641e09dc31e52a0e8 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 09:35:18 -0800 Subject: [PATCH 4/9] Update team.json --- Teams/TeamShog/team.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index 1095cef..99ae9f3 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -5,7 +5,8 @@ "name": "Noah MacDonald", "twitter": "falkirknh", "koding": "falkirks", - "location": "Vancouver, CA" + "location": "Vancouver, CA", + "lead": true }, { "name": "Leon", From 6fcd912ca20b326848a90e285bcc3990da1297b7 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 09:37:27 -0800 Subject: [PATCH 5/9] Update team.json --- Teams/TeamShog/team.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index 99ae9f3..c6c3bec 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -11,26 +11,26 @@ { "name": "Leon", "twitter": "99leonchang", - "koding": "", + "koding": "99leonchang", "location": "Hsinchu, TWN" }, { "name": "Samuel", "twitter": "MegaSam_", - "koding": "", + "koding": "megasamninja", "location": "Sydney, AU" }, { "name": "Adam", "twitter": "TuffDev", - "koding": "", + "koding": "tuffdev", "location": "Fishers, US" }, { "name": "", "twitter": "PEMapModder", - "koding": "", + "koding": "pemapmodder", "location": "Hong Kong, CHN" } ] From 93e09c35a846f37a7e5f88190e9644dd9e738ca1 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Sat, 22 Nov 2014 13:37:34 -0800 Subject: [PATCH 6/9] Update team.json --- Teams/TeamShog/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index c6c3bec..7b22851 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -15,7 +15,7 @@ "location": "Hsinchu, TWN" }, { - "name": "Samuel", + "name": "Samuel Levin", "twitter": "MegaSam_", "koding": "megasamninja", "location": "Sydney, AU" From 67ec9767f7f78e9575b7f6b684fd2d9729a8d845 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Mon, 24 Nov 2014 07:24:40 -0800 Subject: [PATCH 7/9] Update team.json --- Teams/TeamShog/team.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index 7b22851..ba64f19 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -9,7 +9,7 @@ "lead": true }, { - "name": "Leon", + "name": "Leon Chang", "twitter": "99leonchang", "koding": "99leonchang", "location": "Hsinchu, TWN" @@ -28,7 +28,7 @@ "location": "Fishers, US" }, { - "name": "", + "name": "Chris", "twitter": "PEMapModder", "koding": "pemapmodder", "location": "Hong Kong, CHN" From 231c75b2f8c370953bcffb79a64d36577f6338b8 Mon Sep 17 00:00:00 2001 From: Falkirks Date: Mon, 24 Nov 2014 07:29:01 -0800 Subject: [PATCH 8/9] Update team.json --- Teams/TeamShog/team.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index ba64f19..1b4c23b 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -12,7 +12,7 @@ "name": "Leon Chang", "twitter": "99leonchang", "koding": "99leonchang", - "location": "Hsinchu, TWN" + "location": "Hsinchu, TW" }, { "name": "Samuel Levin", @@ -31,7 +31,7 @@ "name": "Chris", "twitter": "PEMapModder", "koding": "pemapmodder", - "location": "Hong Kong, CHN" + "location": "Hong Kong, CN" } ] } From 1ff92d4d44832ca97613ffefda64084aeccfb67f Mon Sep 17 00:00:00 2001 From: Falkirks Date: Mon, 24 Nov 2014 08:39:23 -0800 Subject: [PATCH 9/9] Update team.json --- Teams/TeamShog/team.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Teams/TeamShog/team.json b/Teams/TeamShog/team.json index 1b4c23b..4c4cb42 100644 --- a/Teams/TeamShog/team.json +++ b/Teams/TeamShog/team.json @@ -22,7 +22,7 @@ }, { - "name": "Adam", + "name": "Adam Martin", "twitter": "TuffDev", "koding": "tuffdev", "location": "Fishers, US"