Commit df9de35e authored by Diego Salazar's avatar Diego Salazar
Browse files

Merge branch 'remove-ffs' into 'master'

Removed all traces of "FFS" from the CCS

See merge request !11
parents 37019334 a0d52075
...@@ -4,79 +4,79 @@ ...@@ -4,79 +4,79 @@
"proposals": [ "proposals": [
{ {
"name": "Documentation and cleanup of source code", "name": "Documentation and cleanup of source code",
"local-url": "/forum-funding-system/proposals/documentation-cleanup.html", "local-url": "/proposals/documentation-cleanup.html",
"author": "tewinget", "author": "tewinget",
"date": null "date": null
}, },
{ {
"name": "What is Monero? is produced and open-sourced", "name": "What is Monero? is produced and open-sourced",
"local-url": "/forum-funding-system/proposals/whatismonero-produced.html", "local-url": "/proposals/whatismonero-produced.html",
"author": "savandra", "author": "savandra",
"date": null "date": null
}, },
{ {
"name": "Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples", "name": "Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples",
"local-url": "/forum-funding-system/proposals/improve-devguides-simplewallet.html", "local-url": "/proposals/improve-devguides-simplewallet.html",
"author": "bigredmachine", "author": "bigredmachine",
"date": null "date": null
}, },
{ {
"name": "A continuation for all purpose programming of what needs to get done in monero", "name": "A continuation for all purpose programming of what needs to get done in monero",
"local-url": "/forum-funding-system/proposals/mooo-continuation-programming.html", "local-url": "/proposals/mooo-continuation-programming.html",
"author": "moneromooo", "author": "moneromooo",
"date": null "date": null
}, },
{ {
"name": "Create End-User Kovri documentation", "name": "Create End-User Kovri documentation",
"local-url": "/forum-funding-system/proposals/kovri-end-user-docs.html", "local-url": "/proposals/kovri-end-user-docs.html",
"author": "anonimal", "author": "anonimal",
"date": null "date": null
}, },
{ {
"name": "fluffypony's Conference Circuit Jan 2017 Edition", "name": "fluffypony's Conference Circuit Jan 2017 Edition",
"local-url": "/forum-funding-system/proposals/fp-conference-2017.html", "local-url": "/proposals/fp-conference-2017.html",
"author": "fluffypony", "author": "fluffypony",
"date": null "date": null
}, },
{ {
"name": "The official Qt GUI Project", "name": "The official Qt GUI Project",
"local-url": "/forum-funding-system/proposals/official-qt-gui.html", "local-url": "/proposals/official-qt-gui.html",
"author": "othe", "author": "othe",
"date": null "date": null
}, },
{ {
"name": "Justin's Local Meetup Talks Proposal 1", "name": "Justin's Local Meetup Talks Proposal 1",
"local-url": "/forum-funding-system/proposals/justin-local-meetups-1.html", "local-url": "/proposals/justin-local-meetups-1.html",
"author": "samsunggalaxyplayer", "author": "samsunggalaxyplayer",
"date": null "date": null
}, },
{ {
"name": "Justin's Local Meetup Talks Proposal 2", "name": "Justin's Local Meetup Talks Proposal 2",
"local-url": "/forum-funding-system/proposals/justin-local-meetups-2.html", "local-url": "/proposals/justin-local-meetups-2.html",
"author": "samsunggalaxyplayer", "author": "samsunggalaxyplayer",
"date": null "date": null
}, },
{ {
"name": "More mooo coding goodness", "name": "More mooo coding goodness",
"local-url": "/forum-funding-system/proposals/more-mooo-coding-goodness.html", "local-url": "/proposals/more-mooo-coding-goodness.html",
"author": "moneromooo", "author": "moneromooo",
"date": null "date": null
}, },
{ {
"name": "Funding for a Monero subforum on the largest chinese BTC forum 8BTC", "name": "Funding for a Monero subforum on the largest chinese BTC forum 8BTC",
"local-url": "/forum-funding-system/proposals/monero-subforum-8btc.html", "local-url": "/proposals/monero-subforum-8btc.html",
"author": "firperfect", "author": "firperfect",
"date": null "date": null
}, },
{ {
"name": "Additional GUI Developer", "name": "Additional GUI Developer",
"local-url": "/forum-funding-system/proposals/additional-gui-dev.html", "local-url": "/proposals/additional-gui-dev.html",
"author": "Jaquee", "author": "Jaquee",
"date": null "date": null
}, },
{ {
"name": "Release of new/updated pool software", "name": "Release of new/updated pool software",
"local-url": "/forum-funding-system/proposals/release-pool-software.html", "local-url": "/proposals/release-pool-software.html",
"author": "Snipa22", "author": "Snipa22",
"date": null "date": null
}, },
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
{ {
"name": "Monero Bounty For HackerOne", "name": "Monero Bounty For HackerOne",
"gitlab-url": null, "gitlab-url": null,
"local-url": "/forum-funding-system/proposals/monero-bounty-hackerone.html", "local-url": "/proposals/monero-bounty-hackerone.html",
"author": "anonimal", "author": "anonimal",
"amount": 1500, "amount": 1500,
"amount-funded": 1447.21, "amount-funded": 1447.21,
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
{ {
"name": "Getmonero.org Redesign", "name": "Getmonero.org Redesign",
"gitlab-url": null, "gitlab-url": null,
"local-url": "/forum-funding-system/proposals/getmonero-redesign.html", "local-url": "/proposals/getmonero-redesign.html",
"author": "rehrar", "author": "rehrar",
"date": "February 24, 2017", "date": "February 24, 2017",
"milestones": 4, "milestones": 4,
......
...@@ -48,7 +48,7 @@ layout: base ...@@ -48,7 +48,7 @@ layout: base
<div class="info-block"> <div class="info-block">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.proposals %}
{% if toplevel.stage == "Funding Required" %} {% if toplevel.stage == "Funding Required" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
{% if proposal.name == {{page.title}} %} {% if proposal.name == {{page.title}} %}
......
...@@ -18,7 +18,7 @@ layout: base ...@@ -18,7 +18,7 @@ layout: base
<div class="info-block"> <div class="info-block">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.proposals %}
{% if toplevel.stage == "Work in Progress" %} {% if toplevel.stage == "Work in Progress" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
{% if proposal.name == {{page.title}} %} {% if proposal.name == {{page.title}} %}
......
...@@ -17,7 +17,7 @@ title: Funding Required ...@@ -17,7 +17,7 @@ title: Funding Required
<div class="col-xs-12"> <div class="col-xs-12">
<h1>{{page.title}}</h1> <h1>{{page.title}}</h1>
</div> </div>
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.proposals %}
{% if toplevel.stage == "Funding Required" %} {% if toplevel.stage == "Funding Required" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <div class="col-xs-12">
......
...@@ -20,7 +20,7 @@ title: Ideas ...@@ -20,7 +20,7 @@ title: Ideas
<div class="col-xs-12"> <div class="col-xs-12">
<h1>{{page.title}}</h1> <h1>{{page.title}}</h1>
</div> </div>
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.proposals %}
{% if toplevel.stage == "Ideas" %} {% if toplevel.stage == "Ideas" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <div class="col-xs-12">
......
...@@ -17,7 +17,7 @@ title: Work in Progress ...@@ -17,7 +17,7 @@ title: Work in Progress
<div class="col-xs-12"> <div class="col-xs-12">
<h1>{{page.title}}</h1> <h1>{{page.title}}</h1>
</div> </div>
{% for toplevel in site.data.ffs %} {% for toplevel in site.data.proposals %}
{% if toplevel.stage == "Work in Progress" %} {% if toplevel.stage == "Work in Progress" %}
{% for proposal in toplevel.proposals%} {% for proposal in toplevel.proposals%}
<div class="col-xs-12"> <div class="col-xs-12">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment