From 62995b7ae6d48fe0b7c6a64db660015d76248891 Mon Sep 17 00:00:00 2001 From: BtcDrak Date: Thu, 14 Jan 2016 23:50:49 +0000 Subject: [PATCH 1/2] Add segwit support page --- _posts/en/pages/2016-01-13-segwit-support.md | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 _posts/en/pages/2016-01-13-segwit-support.md diff --git a/_posts/en/pages/2016-01-13-segwit-support.md b/_posts/en/pages/2016-01-13-segwit-support.md new file mode 100644 index 000000000..ccd538bc2 --- /dev/null +++ b/_posts/en/pages/2016-01-13-segwit-support.md @@ -0,0 +1,34 @@ +--- +title: Segregated Witness Support +name: segwit-support +type: page +permalink: /en/segwit_adoption +--- + +The follow is a list of companies and projects which have stated they will support segregated witness. + +To add your company or service, please ACK ticket [#30] with company/service name. + +|#| Name | Planned | Ready |Notes| +|-|------|---------|-------|-----| +|1|[mSIGNA](https://ciphrex.com/)| yes | yes | wallet | +|2|[BitGo](https://www.bitgo.com/)| yes | no| wallet | +|3|[Bitcoinjs](http://bitcoinjs.org/)|yes| no|library| +|4|[Blocktrail](https://www.blocktrail.com/)|yes| no|wallet, block explorer| +|5|[BreadWallet](http://breadwallet.com/)|yes| no|wallet| +|6|[Coinkite](https://coinkite.com/)|yes|no|wallet, hardware wallet| +|7|[Coinomi](https://coinomi.com/)|yes|no|wallet| +|8|[Digitalbitbox](https://digitalbitbox.com/)|yes|no|hardware wallet| +|9|[GreenAddress](https://greenaddress.it/)|yes|no|wallet| +|10|[GreenBits](https://www.greenbits.com/)|yes|no|wallet| +|11|[Ledger](https://www.ledgerwallet.com/)|yes|no|hardware wallet| +|12|[libbitcoin](http://libbitcoin.dyne.org/)|yes|no|library| +|13|[libbtc](https://github.com/libbtc)|yes|no|library| +|14|NBitcoin|yes|no|library| +|15|[Samourai Wallet](http://samouraiwallet.com/)|yes|no|wallet| +|16|[EI8HT](http://ei8.ht/)|yes|no|wallet| +|17|[OmniCore](https://github.com/OmniLayer/omnicore)|yes|no|wallet| + +To add your company or service, please ACK ticket [#30] with company/service name. + +[#30]: https://github.com/bitcoin-core/website/pull/fixme \ No newline at end of file From bc78ad7299aef9555bdbb08ba682c95a1880e398 Mon Sep 17 00:00:00 2001 From: BtcDrak Date: Sat, 16 Jan 2016 15:32:44 +0000 Subject: [PATCH 2/2] add navigation --- _data/navigation.yml | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index fd9a3b403..4b742a460 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -6,29 +6,25 @@ en: about: title: "About" url: "/en/about/" - test: # this is temporary structure to show how to do nested menus - disabled: true # disable from rendering - title: "Nested" - submenu: true - tree: # menus go here - first: - title: "first" - url: "/first" - second: - title: "second" - url: "/second" blog: title: "blog" url: "/en/blog/" releases: title: "releases" url: "/en/releases/" - contribute: - title: "contribute" - url: "/en/contribute/" - meetings: - title: "meetings" - url: "/en/meetings/" + dev: + title: "Development" + submenu: true + tree: + contribute: + title: "contribute" + url: "/en/contribute/" + segwit: + title: "SegWit Adoption" + url: "/en/segwit_adoption/" + meetings: + title: "meetings" + url: "/en/meetings/" de: home: title: "Bitcoin Core"