From aa6374f07a4b26023269044a357337aee67c750f Mon Sep 17 00:00:00 2001 From: Charlotte Fereday Date: Mon, 28 Nov 2016 20:11:00 +0000 Subject: [PATCH 1/3] updates status of projects from active or inactive to: on hold, in progress, or accelerated --- _posts/2016-07-24-BrexLex.md | 2 +- _posts/2016-07-24-BrexitNet.md | 6 +++--- _posts/2016-07-24-CampaignNinja.md | 2 +- _posts/2016-07-24-ExitGap.md | 6 +++--- _posts/2016-07-24-Fixit.md | 8 ++++---- _posts/2016-07-24-IStreetwatch.md | 2 +- _posts/2016-07-24-MinistersUndertheInfluence.md | 2 +- _posts/2016-07-24-PopOutsideTheEchoChamber.md | 2 +- _posts/2016-07-24-TheOtherVoices.md | 6 +++--- _posts/2016-07-24-WhatTheFact.md | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/_posts/2016-07-24-BrexLex.md b/_posts/2016-07-24-BrexLex.md index 009828d..f109b4d 100644 --- a/_posts/2016-07-24-BrexLex.md +++ b/_posts/2016-07-24-BrexLex.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/BrexLex presentation_url: https://drive.google.com/open?id=1l0OWeE34QIPVd_gkPAuZq5afCRTeNqbgG5dL0zXVVqs introduction_url: WEoXSfAtr8Q -status: active +status: in progress --- diff --git a/_posts/2016-07-24-BrexitNet.md b/_posts/2016-07-24-BrexitNet.md index 409d398..fbf9ce5 100644 --- a/_posts/2016-07-24-BrexitNet.md +++ b/_posts/2016-07-24-BrexitNet.md @@ -4,7 +4,7 @@ name: Brexit Net description: Mapping existing data to try and understand new correlations that can bridge the empathy gap display_date: July 2016 github_url: https://github.com/HackBrexit/BrexitNet -presentation_url: -introduction_url: -status: inactive +presentation_url: +introduction_url: +status: on hold --- diff --git a/_posts/2016-07-24-CampaignNinja.md b/_posts/2016-07-24-CampaignNinja.md index 1a5df23..97d4f1f 100644 --- a/_posts/2016-07-24-CampaignNinja.md +++ b/_posts/2016-07-24-CampaignNinja.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/CampaigningNinja presentation-url: https://drive.google.com/open?id=1j0XdlOtpvRWAekr3PDATntDzMaonIs39VzxitAPlqmE introduction_url: GNRqcbHTT4M -status: active +status: on hold --- diff --git a/_posts/2016-07-24-ExitGap.md b/_posts/2016-07-24-ExitGap.md index 36aab4a..2e83a3e 100644 --- a/_posts/2016-07-24-ExitGap.md +++ b/_posts/2016-07-24-ExitGap.md @@ -3,8 +3,8 @@ layout: default name: ExitGap description: Web app to help people identify impacts of Brexit by mapping out where the EU impact the UK, in terms of funding, policy and trade display_date: July 2016 -github_url: https://github.com/HackBrexit/ExitGap -presentation_url: https://drive.google.com/open?id=1VJ_aCrW8TsWwUUPsDmPis3B-2wVmUuIk86nTSfZqzlE +github_url: https://github.com/HackBrexit/ExitGap +presentation_url: https://drive.google.com/open?id=1VJ_aCrW8TsWwUUPsDmPis3B-2wVmUuIk86nTSfZqzlE introduction_url: maUBGM0Pol4 -status: active +status: on hold --- diff --git a/_posts/2016-07-24-Fixit.md b/_posts/2016-07-24-Fixit.md index 9cb6a65..8e7079a 100644 --- a/_posts/2016-07-24-Fixit.md +++ b/_posts/2016-07-24-Fixit.md @@ -1,10 +1,10 @@ --- layout: default name: Fixit -description: +description: display_date: July 2016 -github_url: -presentation_url: https://drive.google.com/open?id=1_DeN7X8uzBsyK9ePBe2je8ljvt_cTvPv9UtU36YpSts +github_url: +presentation_url: https://drive.google.com/open?id=1_DeN7X8uzBsyK9ePBe2je8ljvt_cTvPv9UtU36YpSts introduction_url: opnlCMKfyLI -status: active +status: on hold --- diff --git a/_posts/2016-07-24-IStreetwatch.md b/_posts/2016-07-24-IStreetwatch.md index 5fff6f6..39f0f8e 100644 --- a/_posts/2016-07-24-IStreetwatch.md +++ b/_posts/2016-07-24-IStreetwatch.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/IStreetWatch presentation_url: https://drive.google.com/open?id=1wiyu31ulcOoFEdgGSJO0kEGibAq-fzQQX3JQYkkg7Yk introduction_url: JyzcKjWB8U4 -status: active +status: in progress --- diff --git a/_posts/2016-07-24-MinistersUndertheInfluence.md b/_posts/2016-07-24-MinistersUndertheInfluence.md index 1e10825..3b9d0d4 100644 --- a/_posts/2016-07-24-MinistersUndertheInfluence.md +++ b/_posts/2016-07-24-MinistersUndertheInfluence.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/MinistersUnderTheInfluence presentation_url: https://drive.google.com/open?id=1-CsMiIhywwpsGFKeEBzOfc9a6BTBb8nk284ctJra77o introduction_url: bVbTzTd2ZRs -status: active +status: accelerated --- diff --git a/_posts/2016-07-24-PopOutsideTheEchoChamber.md b/_posts/2016-07-24-PopOutsideTheEchoChamber.md index 76b126f..aa43ac8 100644 --- a/_posts/2016-07-24-PopOutsideTheEchoChamber.md +++ b/_posts/2016-07-24-PopOutsideTheEchoChamber.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/hackbrexit.github.io presentation_url: https://drive.google.com/open?id=1N3PFbBpczqFTsFtcHs3eRdbfW9UhnfVK_Lde5KQxJNw introduction_url: ngXoltv5TEo -status: active +status: on hold --- diff --git a/_posts/2016-07-24-TheOtherVoices.md b/_posts/2016-07-24-TheOtherVoices.md index 6210164..f020811 100644 --- a/_posts/2016-07-24-TheOtherVoices.md +++ b/_posts/2016-07-24-TheOtherVoices.md @@ -3,8 +3,8 @@ layout: default name: The Other Voices description: Build a facility where people can share their personal stories to build a community to connect people and combat propaganda display_date: July 2016 -github_url: https://github.com/HackBrexit/TheOtherVoices +github_url: https://github.com/HackBrexit/TheOtherVoices presentation_url: https://drive.google.com/open?id=1L16bu-7t8LRAIztA6xnd-EdjnMH5HGoZ5bkuEwENUwE -introduction_url: -status: active +introduction_url: +status: on hold --- diff --git a/_posts/2016-07-24-WhatTheFact.md b/_posts/2016-07-24-WhatTheFact.md index 937832f..c8a16e4 100644 --- a/_posts/2016-07-24-WhatTheFact.md +++ b/_posts/2016-07-24-WhatTheFact.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/WhatTheFact presentation_url: https://drive.google.com/open?id=1MfPLxDjFKbsOvzAj-_VtSSUmRh5AQr47SvQQeydYFJk introduction_url: MrPCj9Qv3nE -status: active +status: accelerated --- From 2e96d491cca6a54941959d2cf3ff75c037ed682e Mon Sep 17 00:00:00 2001 From: Charlotte Fereday Date: Wed, 30 Nov 2016 13:39:23 +0000 Subject: [PATCH 2/3] adds Charlotte Fereday to authors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 561d746..c671658 100644 --- a/README.md +++ b/README.md @@ -47,4 +47,4 @@ We invite you to hack three key themes: ## Created by -* Tanya Powell, Eddie Jaoude, Hyewon Kim +* Tanya Powell, Eddie Jaoude, Hyewon Kim, Charlotte Fereday From ffa766f448cb84b10f85c34fa85194957ed77a9e Mon Sep 17 00:00:00 2001 From: Charlotte Fereday Date: Sun, 4 Dec 2016 15:36:19 +0000 Subject: [PATCH 3/3] Updates status of the projects & resolves conflicts --- _layouts/default.html | 12 ++++++++---- _posts/2016-07-24-BrexLex.md | 2 +- _posts/2016-07-24-BrexitNet.md | 2 +- _posts/2016-07-24-CampaignNinja.md | 2 +- _posts/2016-07-24-ExitGap.md | 2 +- _posts/2016-07-24-Fixit.md | 2 +- _posts/2016-07-24-HackBrexit.md | 2 +- _posts/2016-07-24-IStreetwatch.md | 2 +- _posts/2016-07-24-MinistersUndertheInfluence.md | 2 +- _posts/2016-07-24-PopOutsideTheEchoChamber.md | 2 +- _posts/2016-07-24-TheOtherVoices.md | 2 +- _posts/2016-07-24-WhatTheFact.md | 2 +- 12 files changed, 19 insertions(+), 15 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 20a05e3..d34fe53 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -7,12 +7,16 @@

{{ post.name }} - {% if post.status == 'active' %} - Active + {% if post.status == 'Accelerated' %} + Accelerated {% endif %} - {% if post.status == 'inactive' %} - Inactive + {% if post.status == 'In progress' %} + In progress {% endif %} + {% if post.status == 'On hold' %} + On hold + {% endif %} +

diff --git a/_posts/2016-07-24-BrexLex.md b/_posts/2016-07-24-BrexLex.md index f109b4d..942e69b 100644 --- a/_posts/2016-07-24-BrexLex.md +++ b/_posts/2016-07-24-BrexLex.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/BrexLex presentation_url: https://drive.google.com/open?id=1l0OWeE34QIPVd_gkPAuZq5afCRTeNqbgG5dL0zXVVqs introduction_url: WEoXSfAtr8Q -status: in progress +status: In progress --- diff --git a/_posts/2016-07-24-BrexitNet.md b/_posts/2016-07-24-BrexitNet.md index fbf9ce5..f4f8b75 100644 --- a/_posts/2016-07-24-BrexitNet.md +++ b/_posts/2016-07-24-BrexitNet.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/BrexitNet presentation_url: introduction_url: -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-CampaignNinja.md b/_posts/2016-07-24-CampaignNinja.md index 97d4f1f..fabf84d 100644 --- a/_posts/2016-07-24-CampaignNinja.md +++ b/_posts/2016-07-24-CampaignNinja.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/CampaigningNinja presentation-url: https://drive.google.com/open?id=1j0XdlOtpvRWAekr3PDATntDzMaonIs39VzxitAPlqmE introduction_url: GNRqcbHTT4M -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-ExitGap.md b/_posts/2016-07-24-ExitGap.md index 2e83a3e..cc22669 100644 --- a/_posts/2016-07-24-ExitGap.md +++ b/_posts/2016-07-24-ExitGap.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/ExitGap presentation_url: https://drive.google.com/open?id=1VJ_aCrW8TsWwUUPsDmPis3B-2wVmUuIk86nTSfZqzlE introduction_url: maUBGM0Pol4 -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-Fixit.md b/_posts/2016-07-24-Fixit.md index 8e7079a..f710001 100644 --- a/_posts/2016-07-24-Fixit.md +++ b/_posts/2016-07-24-Fixit.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: presentation_url: https://drive.google.com/open?id=1_DeN7X8uzBsyK9ePBe2je8ljvt_cTvPv9UtU36YpSts introduction_url: opnlCMKfyLI -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-HackBrexit.md b/_posts/2016-07-24-HackBrexit.md index 2763a6b..e9574ab 100644 --- a/_posts/2016-07-24-HackBrexit.md +++ b/_posts/2016-07-24-HackBrexit.md @@ -4,5 +4,5 @@ name: HackBrexit description: Hackathon project list display_date: July 2016 github_url: https://github.com/HackBrexit/hackbrexit.github.io -status: active +status: Accelerated --- diff --git a/_posts/2016-07-24-IStreetwatch.md b/_posts/2016-07-24-IStreetwatch.md index 39f0f8e..4462edc 100644 --- a/_posts/2016-07-24-IStreetwatch.md +++ b/_posts/2016-07-24-IStreetwatch.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/IStreetWatch presentation_url: https://drive.google.com/open?id=1wiyu31ulcOoFEdgGSJO0kEGibAq-fzQQX3JQYkkg7Yk introduction_url: JyzcKjWB8U4 -status: in progress +status: In progress --- diff --git a/_posts/2016-07-24-MinistersUndertheInfluence.md b/_posts/2016-07-24-MinistersUndertheInfluence.md index 3b9d0d4..a487a6b 100644 --- a/_posts/2016-07-24-MinistersUndertheInfluence.md +++ b/_posts/2016-07-24-MinistersUndertheInfluence.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/MinistersUnderTheInfluence presentation_url: https://drive.google.com/open?id=1-CsMiIhywwpsGFKeEBzOfc9a6BTBb8nk284ctJra77o introduction_url: bVbTzTd2ZRs -status: accelerated +status: Accelerated --- diff --git a/_posts/2016-07-24-PopOutsideTheEchoChamber.md b/_posts/2016-07-24-PopOutsideTheEchoChamber.md index aa43ac8..de42bfd 100644 --- a/_posts/2016-07-24-PopOutsideTheEchoChamber.md +++ b/_posts/2016-07-24-PopOutsideTheEchoChamber.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/hackbrexit.github.io presentation_url: https://drive.google.com/open?id=1N3PFbBpczqFTsFtcHs3eRdbfW9UhnfVK_Lde5KQxJNw introduction_url: ngXoltv5TEo -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-TheOtherVoices.md b/_posts/2016-07-24-TheOtherVoices.md index f020811..c7314e6 100644 --- a/_posts/2016-07-24-TheOtherVoices.md +++ b/_posts/2016-07-24-TheOtherVoices.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/TheOtherVoices presentation_url: https://drive.google.com/open?id=1L16bu-7t8LRAIztA6xnd-EdjnMH5HGoZ5bkuEwENUwE introduction_url: -status: on hold +status: On hold --- diff --git a/_posts/2016-07-24-WhatTheFact.md b/_posts/2016-07-24-WhatTheFact.md index c8a16e4..0f80755 100644 --- a/_posts/2016-07-24-WhatTheFact.md +++ b/_posts/2016-07-24-WhatTheFact.md @@ -6,5 +6,5 @@ display_date: July 2016 github_url: https://github.com/HackBrexit/WhatTheFact presentation_url: https://drive.google.com/open?id=1MfPLxDjFKbsOvzAj-_VtSSUmRh5AQr47SvQQeydYFJk introduction_url: MrPCj9Qv3nE -status: accelerated +status: Accelerated ---