diff --git a/_config.yml b/_config.yml index 8ca3ce6..265df5d 100644 --- a/_config.yml +++ b/_config.yml @@ -21,8 +21,20 @@ collections: type: section output: false sources: - type: sources + type: section output: true + people_and_organisations: + type: section + output: false + events: + type: section + output: true + key_concepts: + type: section + output: false + notable_projects: + type: section + output: false social: - icon: fa-twitter diff --git a/_events/bitcoin-scaling-battles.md b/_events/bitcoin-scaling-battles.md new file mode 100644 index 0000000..1dbafb8 --- /dev/null +++ b/_events/bitcoin-scaling-battles.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Jul/Aug 2017 - Bitcoin Scaling Battles +no_content: true +permalink: /events/bitcoin-scaling-battles +order: 14 +--- diff --git a/_events/bitconnnnneeeeeccccccttttt.md b/_events/bitconnnnneeeeeccccccttttt.md new file mode 100644 index 0000000..6b5ab65 --- /dev/null +++ b/_events/bitconnnnneeeeeccccccttttt.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Jan 2018 - Bitconnnnneeeeeccccccttttt +no_content: true +permalink: /events/bitconnnnneeeeeccccccttttt +order: 15 +--- diff --git a/_events/crypto-wars-phil-zimmermann-and-pgp.md b/_events/crypto-wars-phil-zimmermann-and-pgp.md new file mode 100644 index 0000000..73178ee --- /dev/null +++ b/_events/crypto-wars-phil-zimmermann-and-pgp.md @@ -0,0 +1,25 @@ +--- +layout: static-informational +title: 1990s - Crypto Wars, Phil Zimmermann and PGP +permalink: /events/crypto-wars-phil-zimmermann-and-pgp +order: 2 +--- +layout: static-informational +From wikipedia: + +> The Crypto Wars is an unofficial name for the U.S. and allied governments' attempts to limit the public's and foreign nations' access to cryptography strong enough to resist decryption by national intelligence agencies (especially USA's NSA). + +[Phil Zimmermann](/people/phil_zimmermann.md) was a key player in this period. The PGP software he authored was considered as munitions by the US government and subject to export licenses. The US government at this time was keen to avoid strong crypto falling into the hands of civilians and foreign governments. At this time the US government was also pushing for specialised key-escrowed chips that would perform encryption, but make the plaintext readable to NSA if necessary. This was rightly considered a gross violation of privacy, rights, and a huge security hole by the cypherpunks. + +Since Public Key encryption was considered a munition, t-shirts like this (containing the RSA sourcecode) were created as a form of civil disobedience using [Adam Back](/people/adam_back.md)'s three-line Perl implementation of RSA: + +![Image of PGP Tshirt](https://upload.wikimedia.org/wikipedia/commons/9/96/Munitions_T-shirt_%28front%29.jpg) + +## Links + +* [Phil Zimmermann's entry in this repository](/people/phil_zimmermann.md) +* [Phil Zimmermann on Wikipedia](https://en.wikipedia.org/wiki/Phil_Zimmermann) +* [Pretty Good Privacy (PGP) on Wikipedia](https://en.wikipedia.org/wiki/Pretty_Good_Privacy) +* 01-Jan-1993 Wired Magazine - [Crypto Rebels](https://www.wired.com/1993/02/crypto-rebels/) by Steven Levy +* 12-Jun-1994 The New York Times - [Battle of the Clipper Chip](http://www.nytimes.com/1994/06/12/magazine/battle-of-the-clipper-chip.html?pagewanted=all) by Stephen Levy +* [Crypto Wars on Wikipedia](https://en.wikipedia.org/wiki/Crypto_Wars) diff --git a/_events/the-altcoin-and-ico-bubble-and-fourth-bitcoin-bubble.md b/_events/the-altcoin-and-ico-bubble-and-fourth-bitcoin-bubble.md new file mode 100644 index 0000000..0e1bf05 --- /dev/null +++ b/_events/the-altcoin-and-ico-bubble-and-fourth-bitcoin-bubble.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Early 2017 - The Altcoin/ICO Bubble and Fourth Bitcoin Bubble +no_content: true +permalink: /events/the-altcoin-and-ico-bubble-and-fourth-bitcoin-bubble +order: 13 +--- diff --git a/_events/the-bitcoinica-hack.md b/_events/the-bitcoinica-hack.md new file mode 100644 index 0000000..d824b5c --- /dev/null +++ b/_events/the-bitcoinica-hack.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Mar 2012 - The Bitcoinica Hack +no_content: true +permalink: /events/the-bitcoinica-hack +order: 6 +--- diff --git a/_events/the-collapse-of-mt-gox-(the-final-goxxing).md b/_events/the-collapse-of-mt-gox-(the-final-goxxing).md new file mode 100644 index 0000000..1c00a70 --- /dev/null +++ b/_events/the-collapse-of-mt-gox-(the-final-goxxing).md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Feb 2014 - The Collapse of Mt Gox (The Final Goxxing) +no_content: true +permalink: /events/the-collapse-of-mt-gox-(the-final-goxxing) +order: 9 +--- diff --git a/_events/the-craig-wright-affair-(and-other-attempts-to-identify-satoshi).md b/_events/the-craig-wright-affair-(and-other-attempts-to-identify-satoshi).md new file mode 100644 index 0000000..b79fc1a --- /dev/null +++ b/_events/the-craig-wright-affair-(and-other-attempts-to-identify-satoshi).md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: May 2016 - The Craig Wright Affair (and other attempts to identify Satoshi) +no_content: true +permalink: /events/the-craig-wright-affair-(and-other-attempts-to-identify-satoshi) +order: 11 +--- diff --git a/_events/the-creation-of-bitcoin-and-early-community.md b/_events/the-creation-of-bitcoin-and-early-community.md new file mode 100644 index 0000000..599f611 --- /dev/null +++ b/_events/the-creation-of-bitcoin-and-early-community.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: 2008/2009 - The Creation of Bitcoin and Early Community +no_content: true +permalink: /events/the-creation-of-bitcoin-and-early-community +order: 3 +--- diff --git a/_events/the-dao-hack.md b/_events/the-dao-hack.md new file mode 100644 index 0000000..80d9d06 --- /dev/null +++ b/_events/the-dao-hack.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: June 2016 - The DAO Hack +no_content: true +permalink: /events/the-dao-hack +order: 12 +--- diff --git a/_events/the-discovery-of-public-key-cryptography.md b/_events/the-discovery-of-public-key-cryptography.md new file mode 100644 index 0000000..f7b515b --- /dev/null +++ b/_events/the-discovery-of-public-key-cryptography.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: 1970s - The Discovery of Public Key Cryptography +no_content: true +permalink: /events/the-discovery-of-public-key-cryptography +order: 1 +--- diff --git a/_events/the-great-bitcoin-bubble-of-2011.md b/_events/the-great-bitcoin-bubble-of-2011.md new file mode 100644 index 0000000..865d9b9 --- /dev/null +++ b/_events/the-great-bitcoin-bubble-of-2011.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Jun 2011 - The Great Bitcoin Bubble of 2011 +no_content: true +permalink: /events/the-great-bitcoin-bubble-of-2011 +order: 4 +--- diff --git a/_events/the-rise-and-fall-of-the-silk-road.md b/_events/the-rise-and-fall-of-the-silk-road.md new file mode 100644 index 0000000..d9f9f9e --- /dev/null +++ b/_events/the-rise-and-fall-of-the-silk-road.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Feb 2011-Oct 2013 - The Rise and Fall of the Silk Road +no_content: true +permalink: /events/the-rise-and-fall-of-the-silk-road +order: 5 +--- diff --git a/_events/the-second-and-third-bitcoin-bubbles.md b/_events/the-second-and-third-bitcoin-bubbles.md new file mode 100644 index 0000000..ead3fcb --- /dev/null +++ b/_events/the-second-and-third-bitcoin-bubbles.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Apr-Dec 2013 - The Second and Third Bitcoin Bubbles +no_content: true +permalink: /events/the-second-and-third-bitcoin-bubbles +order: 8 +--- diff --git a/_events/the-snowden-leaks.md b/_events/the-snowden-leaks.md new file mode 100644 index 0000000..fedb65f --- /dev/null +++ b/_events/the-snowden-leaks.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: June 2013 - The Snowden Leaks +no_content: true +permalink: /events/the-snowden-leaks +order: 7 +--- diff --git a/_events/the-trial-of-ross-ulbricht.md b/_events/the-trial-of-ross-ulbricht.md new file mode 100644 index 0000000..ff8d3b8 --- /dev/null +++ b/_events/the-trial-of-ross-ulbricht.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Feb 2015 - The Trial of Ross Ulbricht +no_content: true +permalink: /events/the-trial-of-ross-ulbricht +order: 10 +--- diff --git a/_key_concepts/anonymous-remailers.md b/_key_concepts/anonymous-remailers.md new file mode 100644 index 0000000..e0b9743 --- /dev/null +++ b/_key_concepts/anonymous-remailers.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Anonymous Remailers +no_content: true +permalink: /key_concepts/anonymous-remailers +order: 6 +--- diff --git a/_key_concepts/bittorrent.md b/_key_concepts/bittorrent.md new file mode 100644 index 0000000..f4990b7 --- /dev/null +++ b/_key_concepts/bittorrent.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: BitTorrent +no_content: true +permalink: /key_concepts/bittorrent +order: 7 +--- diff --git a/_key_concepts/blockchains.md b/_key_concepts/blockchains.md new file mode 100644 index 0000000..2308dd5 --- /dev/null +++ b/_key_concepts/blockchains.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Blockchains +no_content: true +permalink: /key_concepts/blockchains +order: 9 +--- diff --git a/_key_concepts/bloom-filters.md b/_key_concepts/bloom-filters.md new file mode 100644 index 0000000..fcccadb --- /dev/null +++ b/_key_concepts/bloom-filters.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Bloom Filters +no_content: true +permalink: /key_concepts/bloom-filters +order: 11 +--- diff --git a/_key_concepts/cryptographic-signatures.md b/_key_concepts/cryptographic-signatures.md new file mode 100644 index 0000000..98448a1 --- /dev/null +++ b/_key_concepts/cryptographic-signatures.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Cryptographic Signatures +no_content: true +permalink: /key_concepts/cryptographic-signatures +order: 3 +--- diff --git a/_key_concepts/distributed-hash-tables.md b/_key_concepts/distributed-hash-tables.md new file mode 100644 index 0000000..5223303 --- /dev/null +++ b/_key_concepts/distributed-hash-tables.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Distributed Hash Tables +no_content: true +permalink: /key_concepts/distributed-hash-tables +order: 12 +--- diff --git a/_key_concepts/end-to-end-encryption.md b/_key_concepts/end-to-end-encryption.md new file mode 100644 index 0000000..b8f4592 --- /dev/null +++ b/_key_concepts/end-to-end-encryption.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: End-to-End Encryption +no_content: true +permalink: /key_concepts/end-to-end-encryption +order: 4 +--- diff --git a/_key_concepts/hash-functions.md b/_key_concepts/hash-functions.md new file mode 100644 index 0000000..08908e2 --- /dev/null +++ b/_key_concepts/hash-functions.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Hash Functions +no_content: true +permalink: /key_concepts/hash-functions +order: 2 +--- diff --git a/_key_concepts/merkle-trees.md b/_key_concepts/merkle-trees.md new file mode 100644 index 0000000..b62e6e8 --- /dev/null +++ b/_key_concepts/merkle-trees.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Merkle Trees +no_content: true +permalink: /key_concepts/merkle-trees +order: 10 +--- diff --git a/_key_concepts/mesh-networks.md b/_key_concepts/mesh-networks.md new file mode 100644 index 0000000..3653ee3 --- /dev/null +++ b/_key_concepts/mesh-networks.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Mesh Networks +no_content: true +permalink: /key_concepts/mesh-networks +order: 14 +--- diff --git a/_key_concepts/onion-routing.md b/_key_concepts/onion-routing.md new file mode 100644 index 0000000..07fae7c --- /dev/null +++ b/_key_concepts/onion-routing.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Onion Routing +no_content: true +permalink: /key_concepts/onion-routing +order: 8 +--- diff --git a/_key_concepts/p2p-routing-algorithms.md b/_key_concepts/p2p-routing-algorithms.md new file mode 100644 index 0000000..6434b36 --- /dev/null +++ b/_key_concepts/p2p-routing-algorithms.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: P2P Routing Algorithms +no_content: true +permalink: /key_concepts/p2p-routing-algorithms +order: 13 +--- diff --git a/_key_concepts/pgp.md b/_key_concepts/pgp.md new file mode 100644 index 0000000..e5e0e26 --- /dev/null +++ b/_key_concepts/pgp.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: PGP +no_content: true +permalink: /key_concepts/pgp +order: 5 +--- diff --git a/_key_concepts/public-and-private-key-cryptography.md b/_key_concepts/public-and-private-key-cryptography.md new file mode 100644 index 0000000..155a854 --- /dev/null +++ b/_key_concepts/public-and-private-key-cryptography.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Public/Private Key Cryptography +no_content: true +permalink: /key_concepts/public-and-private-key-cryptography +order: 1 +--- diff --git a/_mailing_list/mailing_list_archive.md b/_mailing_list/mailing-list-archive.md similarity index 100% rename from _mailing_list/mailing_list_archive.md rename to _mailing_list/mailing-list-archive.md diff --git a/_notable_projects/bitcoin.md b/_notable_projects/bitcoin.md new file mode 100644 index 0000000..d633e23 --- /dev/null +++ b/_notable_projects/bitcoin.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Bitcoin +no_content: true +permalink: /notable_projects/bitcoin +order: 1 +--- diff --git a/_notable_projects/bittorrent.md b/_notable_projects/bittorrent.md new file mode 100644 index 0000000..a5b15c1 --- /dev/null +++ b/_notable_projects/bittorrent.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: BitTorrent +no_content: true +permalink: /notable_projects/bittorrent +order: 2 +--- diff --git a/_notable_projects/ethereum.md b/_notable_projects/ethereum.md new file mode 100644 index 0000000..1b92011 --- /dev/null +++ b/_notable_projects/ethereum.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Ethereum +no_content: true +permalink: /notable_projects/ethereum +order: 3 +--- diff --git a/_notable_projects/ipfs.md b/_notable_projects/ipfs.md new file mode 100644 index 0000000..1da512f --- /dev/null +++ b/_notable_projects/ipfs.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: IPFS +no_content: true +permalink: /notable_projects/ipfs +order: 4 +--- diff --git a/_notable_projects/joinmarket.md b/_notable_projects/joinmarket.md new file mode 100644 index 0000000..9fe703d --- /dev/null +++ b/_notable_projects/joinmarket.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: JoinMarket +no_content: true +permalink: /notable_projects/joinmarket +order: 5 +--- diff --git a/_notable_projects/openbazaar.md b/_notable_projects/openbazaar.md new file mode 100644 index 0000000..ef94830 --- /dev/null +++ b/_notable_projects/openbazaar.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: OpenBazaar +no_content: true +permalink: /notable_projects/openbazaar +order: 6 +--- diff --git a/_notable_projects/opendime.md b/_notable_projects/opendime.md new file mode 100644 index 0000000..ea6ec5f --- /dev/null +++ b/_notable_projects/opendime.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Opendime +no_content: true +permalink: /notable_projects/opendime +order: 7 +--- diff --git a/_notable_projects/pgp.md b/_notable_projects/pgp.md new file mode 100644 index 0000000..2729571 --- /dev/null +++ b/_notable_projects/pgp.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: PGP +no_content: true +permalink: /notable_projects/pgp +order: 8 +--- diff --git a/_notable_projects/tor.md b/_notable_projects/tor.md new file mode 100644 index 0000000..30c0239 --- /dev/null +++ b/_notable_projects/tor.md @@ -0,0 +1,7 @@ +--- +layout: static-informational +title: Tor +no_content: true +permalink: /notable_projects/tor +order: 9 +--- diff --git a/_people_and_organisations/cryptocurrency-notables.md b/_people_and_organisations/cryptocurrency-notables.md new file mode 100644 index 0000000..204c66f --- /dev/null +++ b/_people_and_organisations/cryptocurrency-notables.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Cryptocurrency Notables +no_content: true +order: 3 +--- diff --git a/_people_and_organisations/cypherpunk-and-cryptocurrency-publications.md b/_people_and_organisations/cypherpunk-and-cryptocurrency-publications.md new file mode 100644 index 0000000..fa25301 --- /dev/null +++ b/_people_and_organisations/cypherpunk-and-cryptocurrency-publications.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Cypherpunk/Cryptocurrency Publications +no_content: true +order: 7 +--- diff --git a/_people_and_organisations/cypherpunk-successor-online-communities.md b/_people_and_organisations/cypherpunk-successor-online-communities.md new file mode 100644 index 0000000..36c988f --- /dev/null +++ b/_people_and_organisations/cypherpunk-successor-online-communities.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Cypherpunk Successor Online Communities +no_content: true +order: 6 +--- diff --git a/_people_and_organisations/early-cypherpunks.md b/_people_and_organisations/early-cypherpunks.md new file mode 100644 index 0000000..104ec72 --- /dev/null +++ b/_people_and_organisations/early-cypherpunks.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Early Cypherpunks +no_content: true +order: 2 +--- diff --git a/_people_and_organisations/later-cypherpunks-and-crypto-anarchists.md b/_people_and_organisations/later-cypherpunks-and-crypto-anarchists.md new file mode 100644 index 0000000..5f5f6d1 --- /dev/null +++ b/_people_and_organisations/later-cypherpunks-and-crypto-anarchists.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Later Cypherpunks and Crypto-Anarchists +no_content: true +order: 4 +--- diff --git a/_people_and_organisations/notable-organsations.md b/_people_and_organisations/notable-organsations.md new file mode 100644 index 0000000..a206615 --- /dev/null +++ b/_people_and_organisations/notable-organsations.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Notable Organsations +no_content: true +order: 5 +--- diff --git a/_people_and_organisations/pioneers-of-modern-cryptography.md b/_people_and_organisations/pioneers-of-modern-cryptography.md new file mode 100644 index 0000000..1c35aac --- /dev/null +++ b/_people_and_organisations/pioneers-of-modern-cryptography.md @@ -0,0 +1,6 @@ +--- +layout: static-informational +title: Pioneers of Modern Cryptography +no_content: true +order: 1 +--- diff --git a/_sources/historical_sources_and_media_articles.md b/_sources/historical-sources-and-media-articles.md similarity index 100% rename from _sources/historical_sources_and_media_articles.md rename to _sources/historical-sources-and-media-articles.md diff --git a/_sources/philosophical_and_ideological_sources.md b/_sources/philosophical-and-ideological-sources.md similarity index 100% rename from _sources/philosophical_and_ideological_sources.md rename to _sources/philosophical-and-ideological-sources.md diff --git a/_sources/technical_sources.md b/_sources/technical-sources.md similarity index 100% rename from _sources/technical_sources.md rename to _sources/technical-sources.md diff --git a/index.html b/index.html index 18dccac..e6d4d31 100644 --- a/index.html +++ b/index.html @@ -30,69 +30,10 @@ layout: default {% include index_section.html title='Sources' collection_name='sources' %} -

People & Organisations

+{% include index_section.html title='People & Organisations' collection_name='people_and_organisations' %} -Note that the same person may occur on multiple lists. +{% include index_section.html title='Events' collection_name='events' %} - +{% include index_section.html title='Key Concepts' collection_name='key_concepts' %} -

Events

- - - -

Key Concepts

- - - -

Notable Projects

- - +{% include index_section.html title='Notable Projects' collection_name='notable_projects' %}