diff --git a/.gitignore b/.gitignore index 4be1ed11..f0d4416c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Thumbs.db .bundle vendor _cache +.jekyll-metadata diff --git a/Gemfile b/Gemfile index f8fbca8b..7d84ca16 100644 --- a/Gemfile +++ b/Gemfile @@ -16,10 +16,10 @@ group :development do gem 'ffi-icu' ## When we upgrade to Jekyll 3.0.0 or higher, remove ## _plugin/remove-html-extension.rb - gem 'jekyll', '~>1.3.0' + gem 'jekyll', '~>3.0' gem 'json' - gem 'less' - gem 'kramdown', '~>1.6.0' + gem 'less', '2.4.0' + gem 'kramdown' gem 'RedCloth' gem 'therubyracer' # required by less gem 'jshintrb', '~>0.3.0' @@ -29,5 +29,5 @@ end ## you can put whatever you want here and bundler will tell us humans to ## install the new Gems. group :slow_test do - gem 'html-proofer' + gem 'html-proofer', '2.1.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 2bed22d9..01d129ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,22 +2,16 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - addressable (2.3.7) - classifier (1.3.3) - fast-stemmer (>= 1.0.0) + addressable (2.4.0) colorator (0.1) colored (1.2) - commander (4.1.5) - highline (~> 1.6.11) commonjs (0.2.7) - ethon (0.7.3) + ethon (0.8.0) ffi (>= 1.3.0) execjs (2.6.0) - fast-stemmer (1.0.2) - ffi (1.9.3) - ffi-icu (0.1.2) + ffi (1.9.10) + ffi-icu (0.1.10) ffi (~> 1.0, >= 1.0.9) - highline (1.6.20) html-proofer (2.1.0) addressable (~> 2.3) colored (~> 1.2) @@ -26,58 +20,51 @@ GEM parallel (~> 1.3) typhoeus (~> 0.7) yell (~> 2.0) - jekyll (1.3.0) - classifier (~> 1.3) + jekyll (3.0.1) colorator (~> 0.1) - commander (~> 4.1.3) - liquid (~> 2.5.2) - listen (~> 1.3) - maruku (~> 0.6.0) - pygments.rb (~> 0.5.0) - redcarpet (~> 2.3.0) - safe_yaml (~> 0.9.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) + mercenary (~> 0.3.3) + rouge (~> 1.7) + safe_yaml (~> 1.0) + jekyll-sass-converter (1.4.0) + sass (~> 3.4) + jekyll-watch (1.3.0) + listen (~> 3.0) jshintrb (0.3.0) execjs multi_json (>= 1.3) rake - json (1.8.1) - kramdown (1.6.0) + json (1.8.3) + kramdown (1.9.0) less (2.4.0) commonjs (~> 0.2.7) - libv8 (3.16.14.3) - liquid (2.5.4) - listen (1.3.1) + libv8 (3.16.14.13) + liquid (3.0.6) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - maruku (0.6.1) - syntax (>= 1.0.0) mercenary (0.3.5) - mini_portile (0.6.2) + mini_portile2 (2.0.0) multi_json (1.11.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - parallel (1.4.1) - posix-spawn (0.3.6) - pygments.rb (0.5.4) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) + parallel (1.6.1) rake (10.4.2) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rb-fsevent (0.9.7) + rb-inotify (0.9.5) ffi (>= 0.5.0) - rb-kqueue (0.2.0) - ffi (>= 0.5.0) - redcarpet (2.3.0) - ref (1.0.5) - safe_yaml (0.9.7) - syntax (1.0.0) - therubyracer (0.12.1) + ref (2.0.0) + rouge (1.10.1) + safe_yaml (1.0.4) + sass (3.4.20) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - typhoeus (0.7.1) - ethon (>= 0.7.1) - yajl-ruby (1.1.0) + typhoeus (0.8.0) + ethon (>= 0.8.0) yell (2.0.5) PLATFORMS @@ -86,10 +73,10 @@ PLATFORMS DEPENDENCIES RedCloth ffi-icu - html-proofer - jekyll (~> 1.3.0) + html-proofer (= 2.1.0) + jekyll (~> 3.0) jshintrb (~> 0.3.0) json - kramdown (~> 1.6.0) - less + kramdown + less (= 2.4.0) therubyracer diff --git a/Makefile b/Makefile index 4136bb5f..a5ef3a20 100644 --- a/Makefile +++ b/Makefile @@ -12,33 +12,34 @@ JEKYLL_LOG=._jekyll.log ####################### ## `make` (no arguments): just build -default: build +default: clean build ## `make preview`: start the built-in Jekyll preview -preview: +preview: clean $S bundle exec jekyll serve ## `make test`: don't build, but do run all tests test: pre-build-tests post-build-tests ## `make valid`: build and run fast tests -valid: pre-build-tests-fast build post-build-tests-fast +valid: clean pre-build-tests-fast build post-build-tests-fast ## `make all`: build and run all tests -all: pre-build-tests build post-build-tests +all: clean pre-build-tests build post-build-tests ## `make deployment`: for use on build server -deployment: install-deps-deployment \ +deployment: clean install-deps-deployment \ valid ## `make travis`: for use with Travis CI -travis: travis-background-keepalive \ +travis: clean travis-background-keepalive \ install-deps-development \ all + ## Install dependencies (development version) install-deps-development: bundle install @@ -95,6 +96,9 @@ manual-checks: manual-check-diff-sha256sums ################# ERROR_ON_OUTPUT="sed '1s/^/ERROR:\n/' | if grep . ; then sed 1iERROR ; false ; else true ; fi" +clean: + $S bundle exec jekyll clean + ## Always build using the default locale so log messages can be grepped. ## This should not affect webpage output. build: @@ -107,13 +111,9 @@ build: ## Jekyll annoyingly returns success even when it emits errors and ## exceptions, so we'll grep its output for error strings -# -## FIXME: temporarily ignoring errors from WEBrick because -## _plugin/remove-html-extension does something hackish until we upgrade -## to Jekyll 3.0.0 check-for-build-errors: $S egrep -i '(error|warn|exception)' $(JEKYLL_LOG) \ - | grep -vi webrick.*filehandler \ + | grep -vi 'rouge/lexers/shell.rb' \ | eval $(ERROR_ON_OUTPUT) diff --git a/README.md b/README.md index 9451bc1c..b9a23d9e 100644 --- a/README.md +++ b/README.md @@ -592,6 +592,8 @@ coordination is usually conducted in #bitcoin-dev on Freenode. active: true ## Banner displayed if 'active: true'. Can use HTML formatting banner: "Chain fork - Please stop mining on bitcoin version 0.8.0. Click here for more information." + ## Date of the alert in YYYY-MM-DD format + date: 2015-03-11 --- {% comment %} diff --git a/_alerts/2012-02-18-protocol-change.html b/_alerts/2012-02-18-protocol-change.html index cc95153d..55d6f292 100644 --- a/_alerts/2012-02-18-protocol-change.html +++ b/_alerts/2012-02-18-protocol-change.html @@ -3,6 +3,7 @@ title: "February 20, 2012 Protocol Changes" shorturl: "feb20" active: false banner: "" +date: 2012-02-18 ---

In June 2010 the Bitcoin reference software version 0.2.10 introduced diff --git a/_alerts/2012-03-16-critical-vulnerability.html b/_alerts/2012-03-16-critical-vulnerability.html index 8ef6b867..7fbfc067 100644 --- a/_alerts/2012-03-16-critical-vulnerability.html +++ b/_alerts/2012-03-16-critical-vulnerability.html @@ -3,6 +3,7 @@ title: "Potentially Critical Security Vulnerability" shorturl: "critfix" active: false banner: "" +date: 2012-03-16 ---

A potential security vulnerability has been discovered in the Windows diff --git a/_alerts/2012-05-14-dos.html b/_alerts/2012-05-14-dos.html index 88cb8855..2d52d847 100644 --- a/_alerts/2012-05-14-dos.html +++ b/_alerts/2012-05-14-dos.html @@ -3,6 +3,7 @@ title: "CVE-2012-2459: Critical Vulnerability (denial-of-service)" shorturl: "dos" active: false banner: "" +date: 2012-05-14 ---

Risks

diff --git a/_alerts/2013-03-11-chain-fork.html b/_alerts/2013-03-11-chain-fork.html index 6ef31653..708beef6 100644 --- a/_alerts/2013-03-11-chain-fork.html +++ b/_alerts/2013-03-11-chain-fork.html @@ -3,6 +3,7 @@ title: "11/12 March 2013 Chain Fork Information" shorturl: "chainfork" active: false banner: "" +date: 2013-03-11 ---

What happened

diff --git a/_alerts/2013-03-15-upgrade-deadline.html b/_alerts/2013-03-15-upgrade-deadline.html index 06f98ff5..4d81ba54 100644 --- a/_alerts/2013-03-15-upgrade-deadline.html +++ b/_alerts/2013-03-15-upgrade-deadline.html @@ -3,6 +3,7 @@ title: "15 May 2013 Upgrade Deadline" shorturl: "may15" active: false banner: "" +date: 2013-03-15 ---

What is happening

diff --git a/_alerts/2013-08-11-android.html b/_alerts/2013-08-11-android.html index 79175222..d1e3830d 100644 --- a/_alerts/2013-08-11-android.html +++ b/_alerts/2013-08-11-android.html @@ -3,6 +3,7 @@ title: "Android Security Vulnerability" active: false shorturl: "android" banner: "" +date: 2013-08-11 ---

What happened

diff --git a/_alerts/2014-02-11-malleability.html b/_alerts/2014-02-11-malleability.html index 1b58f1ee..88bea5e5 100644 --- a/_alerts/2014-02-11-malleability.html +++ b/_alerts/2014-02-11-malleability.html @@ -2,6 +2,7 @@ title: "Transaction malleability" active: false banner: "" +date: 2014-02-11 ---

What happened

diff --git a/_alerts/2014-04-11-heartbleed.html b/_alerts/2014-04-11-heartbleed.html index 50b98e26..1644282a 100644 --- a/_alerts/2014-04-11-heartbleed.html +++ b/_alerts/2014-04-11-heartbleed.html @@ -3,6 +3,7 @@ title: "OpenSSL Heartbleed vulnerability" shorturl: "heartbleed" active: false banner: "" +date: 2014-04-11 ---

What happened

diff --git a/_alerts/2015-07-04-spv-mining.md b/_alerts/2015-07-04-spv-mining.md index 6a404c5c..d11ce6e0 100644 --- a/_alerts/2015-07-04-spv-mining.md +++ b/_alerts/2015-07-04-spv-mining.md @@ -5,6 +5,7 @@ title: "Some Miners Generating Invalid Blocks" shorturl: "spv-mining" active: false +date: 2015-07-04 #banner: "WARNING: many wallets currently vulnerable to double-spending of confirmed transactions (click here to read)" bannerclass: "alert" --- diff --git a/_config.yml b/_config.yml index fc8f73bf..3cc17823 100644 --- a/_config.yml +++ b/_config.yml @@ -176,7 +176,7 @@ baseurl: / source: . destination: ./_site -plugins: ./_plugins +plugins_dir: ./_plugins exclude: - Gemfile - Gemfile.lock @@ -185,10 +185,9 @@ exclude: future: true lsi: false -highlighter: rouge -pygments: true markdown: kramdown permalink: date +excerpt_separator: "" rdiscount: extensions: [] @@ -198,7 +197,15 @@ kramdown: footnote_nr: 1 entity_output: as_char toc_levels: 2..6 - use_coderay: false + enable_coderay: false + syntax_highlighter: rouge + syntax_highlighter_opts: + ## With the 'text' option, no highlighting is applied by default. We + ## need this for backwards compatibility with existing code blocks. + default_lang: text + + ## Might be useful in the future, but turn off for upgrade to Jekyll 3.0 + css_class: coderay: coderay_wrap: div @@ -505,3 +512,37 @@ devsearches: - "tx": "/en/developer-reference#tx" - "verack": "/en/developer-reference#verack" - "version": "/en/developer-reference#version" + +collections: + ## _alerts + alerts: + output: true + permalink: /en/alert/:path + ## _releases + releases: + output: true + permalink: /en/release/:path + +defaults: + - scope: + path: "" + type: alerts + values: + layout: alert + lang: en + - scope: + path: "" + type: releases + values: + layout: release + lang: en + breadcrumbs: + - bitcoin + - bcc + - bcc news + - RELEASE + - scope: + path: "" + type: posts + values: + lang: en diff --git a/_layouts/alert.html b/_layouts/alert.html index de04d32e..99728ee5 100644 --- a/_layouts/alert.html +++ b/_layouts/alert.html @@ -3,7 +3,7 @@ # http://opensource.org/licenses/MIT. layout: base -lang: en +## Note: global variables like page.lang must be set in _config.yml for collections --- {% if page.canonical != nil %} diff --git a/_layouts/release.html b/_layouts/release.html index 0b7f2559..f34c418b 100644 --- a/_layouts/release.html +++ b/_layouts/release.html @@ -3,13 +3,7 @@ # http://opensource.org/licenses/MIT. layout: base-core -lang: en - -breadcrumbs: - - bitcoin - - bcc - - bcc news - - RELEASE +## Note: global variables like page.lang must be set in _config.yml for collections ---
diff --git a/_plugins/filter_for.rb b/_plugins/filter_for.rb deleted file mode 100644 index 71ec2037..00000000 --- a/_plugins/filter_for.rb +++ /dev/null @@ -1,64 +0,0 @@ -# This file is licensed under the MIT License (MIT) available on -# http://opensource.org/licenses/MIT. - -#filter_for allows to loop in site.pages sorted and filtered -#by custom page variables. - -#Example: -#{% filter_for p in site.pages sort_by:date category:release lang:{{page.lang}} %} -# .. -#{% endfilter_for %} - -module Jekyll - - module SortedForImpl - def render(context) - sorted_collection = collection_to_sort context - return if sorted_collection.empty? - sort_attr = @attributes['sort_by'] - @attributes.delete('sort_by') - #filter page by given attributes - s = [] - for x in sorted_collection - catch :root do - @attributes.each do |at,atval| - atval = Liquid::Template.parse(atval).render context - throw :root unless x.to_liquid.has_key?(at) and x.to_liquid[at] == atval - end - s.push(x) - end - end - sorted_collection = s - #sort collection by given variable - if sorted_collection.length > 1 - sorted_collection = sorted_collection.sort_by { |i| i.to_liquid[sort_attr] } - end - #return modified array - original_name = @collection_name - result = nil - context.stack do - sorted_collection_name = "#{@collection_name}_sorted".sub('.', '_') - context[sorted_collection_name] = sorted_collection - @collection_name = sorted_collection_name - result = super - @collection_name = original_name - end - result - end - end - - class SortedForTag < Liquid::For - include SortedForImpl - - def collection_to_sort(context) - return context[@collection_name].dup - end - - def end_tag - 'endfilter_for' - end - end - -end - -Liquid::Template.register_tag('filter_for', Jekyll::SortedForTag) diff --git a/_plugins/remove-html-extension.rb b/_plugins/remove-html-extension.rb deleted file mode 100644 index 75153636..00000000 --- a/_plugins/remove-html-extension.rb +++ /dev/null @@ -1,31 +0,0 @@ -# This file is licensed under the MIT License (MIT) available on -# http://opensource.org/licenses/MIT. - -# remove-html-extensions is a temporary workaround to allow the built-in -# Jekyll server to serve files like /foo.html as /foo -# This functonality is already part of Jekyll 3.0.0beta and this plugin -# can be removed when we upgrade that far - -require 'webrick' -include WEBrick - -## Code starting here taken from https://github.com/jekyll/jekyll/commit/e99a9e5821a7ba16ce42a1f5de378012f22acae0 MIT license - -# Custom WEBrick FileHandler servlet for serving "/file.html" at "/file" -# when no exact match is found. This mirrors the behavior of GitHub Pages -# and many static web server configs. -class FileHandler < ::WEBrick::HTTPServlet::FileHandler - def search_file(req, res, basename) - if file = super - file - else - super(req, res, "#{basename}.html") - end - end -end - -## End copied code - -## Horribly hackish and produces a warning, but it works and avoids us -## having to modify Jekyll on every end-user system -WEBrick::HTTPServlet::FileHandler = FileHandler diff --git a/_releases/0.10.0.md b/_releases/v0.10.0.md similarity index 99% rename from _releases/0.10.0.md rename to _releases/v0.10.0.md index 39be7f17..c6883645 100644 --- a/_releases/0.10.0.md +++ b/_releases/v0.10.0.md @@ -4,12 +4,12 @@ # Text originally from Bitcoin Core project # Metadata and small formatting changes from Bitcoin.org project -## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) +## Required release version. required_version: 0.10.0 +## Required title. +title: Bitcoin Core version 0.10.0 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-02-16 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.10.1.md b/_releases/v0.10.1.md similarity index 96% rename from _releases/0.10.1.md rename to _releases/v0.10.1.md index 493b2300..94ada253 100644 --- a/_releases/0.10.1.md +++ b/_releases/v0.10.1.md @@ -4,12 +4,12 @@ # Text originally from Bitcoin Core project # Metadata and small formatting changes from Bitcoin.org project -## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) +## Required release version. required_version: 0.10.1 +## Required title. +title: Bitcoin Core version 0.10.1 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-04-27 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.10.2.md b/_releases/v0.10.2.md similarity index 94% rename from _releases/0.10.2.md rename to _releases/v0.10.2.md index 44d5d48d..d9248c41 100644 --- a/_releases/0.10.2.md +++ b/_releases/v0.10.2.md @@ -4,12 +4,12 @@ # Text originally from Bitcoin Core project # Metadata and small formatting changes from Bitcoin.org project -## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) +## Required release version. required_version: 0.10.2 +## Required title. +title: Bitcoin Core version 0.10.2 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-05-19 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.10.3.md b/_releases/v0.10.3.md similarity index 98% rename from _releases/0.10.3.md rename to _releases/v0.10.3.md index 0b7a752d..50118eb7 100644 --- a/_releases/0.10.3.md +++ b/_releases/v0.10.3.md @@ -4,10 +4,10 @@ ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.10.3 +## Required title. +title: Bitcoin Core version 0.10.3 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-10-14 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.11.0.md b/_releases/v0.11.0.md similarity index 99% rename from _releases/0.11.0.md rename to _releases/v0.11.0.md index b9f54625..20299a3d 100644 --- a/_releases/0.11.0.md +++ b/_releases/v0.11.0.md @@ -4,12 +4,12 @@ # Text originally from Bitcoin Core project # Metadata and small formatting changes from Bitcoin.org project -## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) +## Required release version. required_version: 0.11.0 +## Required title. +title: Bitcoin Core version 0.11.0 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-07-12 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.11.1.md b/_releases/v0.11.1.md similarity index 98% rename from _releases/0.11.1.md rename to _releases/v0.11.1.md index 9e759a09..3d860452 100644 --- a/_releases/0.11.1.md +++ b/_releases/v0.11.1.md @@ -6,10 +6,10 @@ ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.11.1 +## Required title. +title: Bitcoin Core version 0.11.1 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-10-15 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.11.2.md b/_releases/v0.11.2.md similarity index 98% rename from _releases/0.11.2.md rename to _releases/v0.11.2.md index 52b05529..8e456d05 100644 --- a/_releases/0.11.2.md +++ b/_releases/v0.11.2.md @@ -6,10 +6,10 @@ ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.11.2 +## Required title. +title: Bitcoin Core version 0.11.2 released ## Optional release date. May be filled in hours/days after a release optional_date: 2015-11-13 -## Optional title. If not set, default is: Bitcoin Core version %v released -optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client ## and View Details, or install the transmission-cli Debian/Ubuntu package ## and run: transmission-show -m diff --git a/_releases/0.3.21.md b/_releases/v0.3.21.md similarity index 97% rename from _releases/0.3.21.md rename to _releases/v0.3.21.md index fbe62f00..ed2121d4 100644 --- a/_releases/0.3.21.md +++ b/_releases/v0.3.21.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.3.21 optional_date: 2011-04-27 -optional_title: Bitcoin version 0.3.21 released +title: Bitcoin version 0.3.21 released --- Binaries for Bitcoin version 0.3.21 are available at: diff --git a/_releases/0.3.22.md b/_releases/v0.3.22.md similarity index 96% rename from _releases/0.3.22.md rename to _releases/v0.3.22.md index b1a4b1cc..dcd29ed7 100644 --- a/_releases/0.3.22.md +++ b/_releases/v0.3.22.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.3.22 optional_date: 2011-06-05 -optional_title: Bitcoin version 0.3.22 released +title: Bitcoin version 0.3.22 released --- Download URL: diff --git a/_releases/0.3.23.md b/_releases/v0.3.23.md similarity index 96% rename from _releases/0.3.23.md rename to _releases/v0.3.23.md index 5a8ab003..be27eb04 100644 --- a/_releases/0.3.23.md +++ b/_releases/v0.3.23.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.3.23 optional_date: 2011-06-14 -optional_title: Bitcoin version 0.3.23 released +title: Bitcoin version 0.3.23 released --- Win32, Linux, MacOSX and source releases for bitcoin v0.3.23 have been uploaded to diff --git a/_releases/0.3.24.md b/_releases/v0.3.24.md similarity index 97% rename from _releases/0.3.24.md rename to _releases/v0.3.24.md index 0701fe9d..8179d8d7 100644 --- a/_releases/0.3.24.md +++ b/_releases/v0.3.24.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.3.24 optional_date: 2011-07-08 -optional_title: Bitcoin version 0.3.24 released +title: Bitcoin version 0.3.24 released --- [Full announcement (including signatures)](http://sourceforge.net/mailarchive/message.php?msg_id=27771039) diff --git a/_releases/0.4.0.md b/_releases/v0.4.0.md similarity index 98% rename from _releases/0.4.0.md rename to _releases/v0.4.0.md index 1d5809c5..231cb071 100644 --- a/_releases/0.4.0.md +++ b/_releases/v0.4.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.4.0 optional_date: 2011-09-23 -optional_title: Bitcoin version 0.4.0 released +title: Bitcoin version 0.4.0 released --- [Full announcement (including signatures)](http://sourceforge.net/mailarchive/message.php?msg_id=28132490) diff --git a/_releases/0.5.0.md b/_releases/v0.5.0.md similarity index 98% rename from _releases/0.5.0.md rename to _releases/v0.5.0.md index c9a13d92..31620c70 100644 --- a/_releases/0.5.0.md +++ b/_releases/v0.5.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.5.0 optional_date: 2011-11-21 -optional_title: Bitcoin-Qt version 0.5.0 released +title: Bitcoin-Qt version 0.5.0 released --- Bitcoin-Qt version 0.5.0 is now available for download at: diff --git a/_releases/0.5.1.md b/_releases/v0.5.1.md similarity index 97% rename from _releases/0.5.1.md rename to _releases/v0.5.1.md index bb4d2280..fc8ed429 100644 --- a/_releases/0.5.1.md +++ b/_releases/v0.5.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.5.1 optional_date: 2011-12-15 -optional_title: Bitcoin-Qt version 0.5.1 released +title: Bitcoin-Qt version 0.5.1 released --- Bitcoin-Qt version 0.5.1 is now available for download at: diff --git a/_releases/0.5.2.md b/_releases/v0.5.2.md similarity index 96% rename from _releases/0.5.2.md rename to _releases/v0.5.2.md index 2baf9f09..ff6badd5 100644 --- a/_releases/0.5.2.md +++ b/_releases/v0.5.2.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.5.2 optional_date: 2012-01-09 -optional_title: Bitcoin-Qt version 0.5.2 released +title: Bitcoin-Qt version 0.5.2 released --- Bitcoin-Qt version 0.5.2 is now available for download at: diff --git a/_releases/0.5.3.1.md b/_releases/v0.5.3.1.md similarity index 93% rename from _releases/0.5.3.1.md rename to _releases/v0.5.3.1.md index bfda6840..87dace8a 100644 --- a/_releases/0.5.3.1.md +++ b/_releases/v0.5.3.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.5.3.1 optional_date: 2012-03-16 -optional_title: Bitcoin-Qt version 0.5.3.1 released +title: Bitcoin-Qt version 0.5.3.1 released --- Bitcoin-Qt version 0.5.3.1 for Windows is now available for download at: diff --git a/_releases/0.5.3.md b/_releases/v0.5.3.md similarity index 98% rename from _releases/0.5.3.md rename to _releases/v0.5.3.md index 0e3e4988..e768d163 100644 --- a/_releases/0.5.3.md +++ b/_releases/v0.5.3.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.5.3 optional_date: 2012-03-14 -optional_title: Bitcoin-Qt version 0.5.3 released +title: Bitcoin-Qt version 0.5.3 released --- Bitcoin-Qt version 0.5.3 is now available for download at: diff --git a/_releases/0.6.0.md b/_releases/v0.6.0.md similarity index 99% rename from _releases/0.6.0.md rename to _releases/v0.6.0.md index cfcd0b75..5972aeb9 100644 --- a/_releases/0.6.0.md +++ b/_releases/v0.6.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.6.0 optional_date: 2012-03-30 -optional_title: Bitcoin-Qt version 0.6.0 released +title: Bitcoin-Qt version 0.6.0 released --- Bitcoin-Qt version 0.6.0 is now available for download at: diff --git a/_releases/0.6.1.md b/_releases/v0.6.1.md similarity index 97% rename from _releases/0.6.1.md rename to _releases/v0.6.1.md index 295ba12e..aa71b094 100644 --- a/_releases/0.6.1.md +++ b/_releases/v0.6.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.6.1 optional_date: 2012-05-04 -optional_title: Bitcoin-Qt version 0.6.1 released +title: Bitcoin-Qt version 0.6.1 released --- Bitcoin-Qt version 0.6.1 is now available for download at: diff --git a/_releases/0.6.2.md b/_releases/v0.6.2.md similarity index 97% rename from _releases/0.6.2.md rename to _releases/v0.6.2.md index 20e7ef83..8d182586 100644 --- a/_releases/0.6.2.md +++ b/_releases/v0.6.2.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.6.2 optional_date: 2012-05-08 -optional_title: Bitcoin-Qt version 0.6.2 released +title: Bitcoin-Qt version 0.6.2 released --- Bitcoin-Qt version 0.6.2 is now available for download at: diff --git a/_releases/0.6.3.md b/_releases/v0.6.3.md similarity index 97% rename from _releases/0.6.3.md rename to _releases/v0.6.3.md index 666b1c87..df2d6912 100644 --- a/_releases/0.6.3.md +++ b/_releases/v0.6.3.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.6.3 optional_date: 2012-06-25 -optional_title: Bitcoin-Qt version 0.6.3 released +title: Bitcoin-Qt version 0.6.3 released --- Bitcoin-Qt version 0.6.3 is now available for download at: diff --git a/_releases/0.7.0.md b/_releases/v0.7.0.md similarity index 99% rename from _releases/0.7.0.md rename to _releases/v0.7.0.md index e0ebcb70..63cf9556 100644 --- a/_releases/0.7.0.md +++ b/_releases/v0.7.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.7.0 optional_date: 2012-09-17 -optional_title: Bitcoin-Qt version 0.7.0 released +title: Bitcoin-Qt version 0.7.0 released --- Bitcoin-Qt version 0.7.0 is now available for download at: diff --git a/_releases/0.7.1.md b/_releases/v0.7.1.md similarity index 98% rename from _releases/0.7.1.md rename to _releases/v0.7.1.md index 767582b6..23f798c0 100644 --- a/_releases/0.7.1.md +++ b/_releases/v0.7.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.7.1 optional_date: 2012-10-19 -optional_title: Bitcoin-Qt version 0.7.1 released +title: Bitcoin-Qt version 0.7.1 released --- Bitcoin-Qt version 0.7.1 is now available from: diff --git a/_releases/0.7.2.md b/_releases/v0.7.2.md similarity index 98% rename from _releases/0.7.2.md rename to _releases/v0.7.2.md index 5f7e9e56..d1350831 100644 --- a/_releases/0.7.2.md +++ b/_releases/v0.7.2.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.7.2 optional_date: 2012-12-14 -optional_title: Bitcoin-Qt version 0.7.2 released +title: Bitcoin-Qt version 0.7.2 released --- Bitcoin-Qt version 0.7.2 is now available from: diff --git a/_releases/0.8.0.md b/_releases/v0.8.0.md similarity index 99% rename from _releases/0.8.0.md rename to _releases/v0.8.0.md index d8c80dbe..f930fea2 100644 --- a/_releases/0.8.0.md +++ b/_releases/v0.8.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.0 optional_date: 2013-02-19 -optional_title: Bitcoin-Qt version 0.8.0 released +title: Bitcoin-Qt version 0.8.0 released --- Bitcoin-Qt version 0.8.0 are now available from: diff --git a/_releases/0.8.1.md b/_releases/v0.8.1.md similarity index 99% rename from _releases/0.8.1.md rename to _releases/v0.8.1.md index ca6cd3dc..fa6128f1 100644 --- a/_releases/0.8.1.md +++ b/_releases/v0.8.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.1 optional_date: 2013-03-18 -optional_title: Bitcoin-Qt version 0.8.1 released +title: Bitcoin-Qt version 0.8.1 released --- Bitcoin-Qt version 0.8.1 is now available from: diff --git a/_releases/0.8.2.md b/_releases/v0.8.2.md similarity index 99% rename from _releases/0.8.2.md rename to _releases/v0.8.2.md index a987177b..70c1370c 100644 --- a/_releases/0.8.2.md +++ b/_releases/v0.8.2.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.2 optional_date: 2013-05-29 -optional_title: Bitcoin-Qt version 0.8.2 released +title: Bitcoin-Qt version 0.8.2 released --- Bitcoin-Qt version 0.8.2 is now available from: diff --git a/_releases/0.8.3.md b/_releases/v0.8.3.md similarity index 99% rename from _releases/0.8.3.md rename to _releases/v0.8.3.md index 22ac8563..5252c02d 100644 --- a/_releases/0.8.3.md +++ b/_releases/v0.8.3.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.3 optional_date: 2013-06-25 -optional_title: Bitcoin-Qt version 0.8.3 released +title: Bitcoin-Qt version 0.8.3 released --- Bitcoin-Qt version 0.8.3 is now available from: diff --git a/_releases/0.8.4.md b/_releases/v0.8.4.md similarity index 98% rename from _releases/0.8.4.md rename to _releases/v0.8.4.md index b275ecab..eea24a95 100644 --- a/_releases/0.8.4.md +++ b/_releases/v0.8.4.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.4 optional_date: 2013-09-03 -optional_title: Bitcoin-Qt version 0.8.4 released +title: Bitcoin-Qt version 0.8.4 released --- Bitcoin-Qt version 0.8.4 is now available from: diff --git a/_releases/0.8.5.md b/_releases/v0.8.5.md similarity index 97% rename from _releases/0.8.5.md rename to _releases/v0.8.5.md index c1236ae3..6341ec69 100644 --- a/_releases/0.8.5.md +++ b/_releases/v0.8.5.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.5 optional_date: 2013-09-13 -optional_title: Bitcoin-Qt version 0.8.5 released +title: Bitcoin-Qt version 0.8.5 released --- Bitcoin-Qt version 0.8.5 is now available from: diff --git a/_releases/0.8.6.md b/_releases/v0.8.6.md similarity index 98% rename from _releases/0.8.6.md rename to _releases/v0.8.6.md index 5ce19ddd..04c50aa0 100644 --- a/_releases/0.8.6.md +++ b/_releases/v0.8.6.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.8.6 optional_date: 2013-12-09 -optional_title: Bitcoin-Qt version 0.8.6 released +title: Bitcoin-Qt version 0.8.6 released --- Bitcoin-Qt version 0.8.6 is now available from: diff --git a/_releases/0.9.0.md b/_releases/v0.9.0.md similarity index 99% rename from _releases/0.9.0.md rename to _releases/v0.9.0.md index 86a1d26b..39f6d1a9 100644 --- a/_releases/0.9.0.md +++ b/_releases/v0.9.0.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.9.0 optional_date: 2014-03-19 -optional_title: Bitcoin Core version 0.9.0 released +title: Bitcoin Core version 0.9.0 released --- Bitcoin Core version 0.9.0 is now available from: diff --git a/_releases/0.9.1.md b/_releases/v0.9.1.md similarity index 97% rename from _releases/0.9.1.md rename to _releases/v0.9.1.md index 9a5a7edd..c97c5cd1 100644 --- a/_releases/0.9.1.md +++ b/_releases/v0.9.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.9.1 optional_date: 2014-04-08 -optional_title: Bitcoin Core version 0.9.1 released +title: Bitcoin Core version 0.9.1 released --- Bitcoin Core version 0.9.1 is now available from: diff --git a/_releases/0.9.2.1.md b/_releases/v0.9.2.1.md similarity index 99% rename from _releases/0.9.2.1.md rename to _releases/v0.9.2.1.md index 867b7061..62a8159e 100644 --- a/_releases/0.9.2.1.md +++ b/_releases/v0.9.2.1.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.9.2.1 optional_date: 2014-06-19 -optional_title: Bitcoin Core version 0.9.2.1 released +title: Bitcoin Core version 0.9.2.1 released --- Bitcoin Core version 0.9.2.1 is now available from: diff --git a/_releases/0.9.2.md b/_releases/v0.9.2.md similarity index 99% rename from _releases/0.9.2.md rename to _releases/v0.9.2.md index 1d478797..aa3c4d6e 100644 --- a/_releases/0.9.2.md +++ b/_releases/v0.9.2.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.9.2 optional_date: 2014-06-16 -optional_title: Bitcoin Core version 0.9.2 released +title: Bitcoin Core version 0.9.2 released --- Bitcoin Core version 0.9.2 is now available from: diff --git a/_releases/0.9.3.md b/_releases/v0.9.3.md similarity index 98% rename from _releases/0.9.3.md rename to _releases/v0.9.3.md index fef71a57..7c655e5d 100644 --- a/_releases/0.9.3.md +++ b/_releases/v0.9.3.md @@ -7,7 +7,7 @@ ## Please see _releases/0.10.0.md for a release template required_version: 0.9.3 optional_date: 2014-09-27 -optional_title: Bitcoin Core version 0.9.3 released +title: Bitcoin Core version 0.9.3 released --- Bitcoin Core version 0.9.3 is now available from: diff --git a/_templates/events.html b/_templates/events.html index fe0440b8..f5c7ee31 100644 --- a/_templates/events.html +++ b/_templates/events.html @@ -5,6 +5,8 @@ layout: base id: events --- +{% assign date_sorted_conferences = site.conferences | sort: 'date' %} +{% assign date_sorted_meetups = site.meetups | sort: 'date' %}

{% translate pagetitle %}rss

@@ -18,21 +20,21 @@ id: events
-{% filter_for p in site.conferences sort_by:date %}{% if p.geoloc %} +{% for p in date_sorted_conferences %}{% if p.geoloc %}
{{ p.title | htmlescape }}
{{ p.date }}
{{ p.venue | htmlescape }}
{{ p.address | htmlescape }}
{{ p.city | htmlescape }}, {{ p.country | htmlescape }}
-{% endif %}{% endfilter_for %} +{% endif %}{% endfor %} -{% filter_for p in site.meetups sort_by:date %}{% if p.geoloc %} +{% for p in date_sorted_meetups %}{% if p.geoloc %}
{{ p.title | htmlescape }}
{{ p.date }}
{{ p.venue | htmlescape }}
{{ p.address | htmlescape }}
{{ p.city | htmlescape }}, {{ p.country | htmlescape }}
-{% endif %}{% endfilter_for %} +{% endif %}{% endfor %}

{% translate upcoming %}

-{% filter_for p in site.conferences sort_by:date %} +{% for p in date_sorted_conferences %}
{{ p.date | date:"%Y-%m-%d" }}
{{ p.city | htmlescape }}, {{ p.country | htmlescape }}
-{% endfilter_for %} +{% endfor %} {% translate eventsubmit %}
diff --git a/en/alerts.html b/en/alerts.html index fac41c1f..de666e21 100644 --- a/en/alerts.html +++ b/en/alerts.html @@ -7,6 +7,7 @@ lang: en id: alerts title: Network status and alerts - Bitcoin --- +{% assign date_sorted_alerts = site.alerts | sort: 'date' %} @@ -20,19 +21,19 @@ title: Network status and alerts - Bitcoin {% else %}
The following network event is ongoing.
    - {% filter_for p in site.pages reversed sort_by:date category:alert %}{% if p.active == true %} + {% for p in date_sorted_alerts reversed %}{% if p.active == true %}
  • {{ p.date | date:"%Y-%m-%d" }} - {{ p.title }}
    • - {% endif %}{% endfilter_for %} + {% endif %}{% endfor %}
{% endif %}
    - {% filter_for p in site.pages reversed sort_by:date category:alert %}{% if p.active == false %} + {% for p in date_sorted_alerts reversed %}{% if p.active == false %}
  • {{ p.date | date:"%Y-%m-%d" }} - {{ p.title }}
    • - {% endif %}{% endfilter_for %} + {% endif %}{% endfor %}

Status and distribution of Bitcoin nodes

Propagation time on the network

diff --git a/en/bitcoin-core/index.md b/en/bitcoin-core/index.md index c72f859f..f4978363 100644 --- a/en/bitcoin-core/index.md +++ b/en/bitcoin-core/index.md @@ -11,6 +11,7 @@ breadcrumbs: - bitcoin - Bitcoin Core --- +{% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %} # Bitcoin Core @@ -85,9 +86,9 @@ breadcrumbs: {% comment %}{% endcomment %} {% capture text_releases %} - {% filter_for p in site.pages reversed sort_by:versionint category:release %} +{% for p in date_sorted_releases reversed %} {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}{{ p.title }}:: - {% endfilter_for %} + {% endfor %} {% endcapture %} {% assign array_releases = text_releases | strip_newlines | split: '::' %} diff --git a/en/rss/alerts.rss b/en/rss/alerts.rss index d35fe0b2..efae47aa 100644 --- a/en/rss/alerts.rss +++ b/en/rss/alerts.rss @@ -15,13 +15,14 @@ lang: en https://bitcoin.org/img/icons/logo_rss.png https://bitcoin.org/en/alerts - {% filter_for p in site.pages reversed sort_by:date category:alert %} + {% assign date_sorted_alerts = site.alerts | sort: 'date' %} + {% for p in date_sorted_alerts reversed %} {{ p.title | htmlescape }} - https://bitcoin.org{{ p.url | replace:'.html','' }} - https://bitcoin.org{{ p.url | replace:'.html','' }} + https://bitcoin.org{{ p.url }} + https://bitcoin.org{{ p.url }} {{ p.date | date: "%a, %d %b %Y" }} 00:00:00 GMT - {% endfilter_for %} + {% endfor %} diff --git a/en/rss/events.rss b/en/rss/events.rss index f5de041d..91546a6f 100644 --- a/en/rss/events.rss +++ b/en/rss/events.rss @@ -16,13 +16,14 @@ lang: en https://bitcoin.org/img/icons/logo_rss.png https://bitcoin.org/en/events - {% filter_for p in site.conferences sort_by:date %} + {% assign date_sorted_conferences = site.conferences | sort: 'date' %} + {% for p in date_sorted_conferences %} {{ p.title | htmlescape }}, {{ p.city | htmlescape }} - {{ p.country | htmlescape }} - {{ p.link }} - {{ p.link }} + {{p.link}} + {{p.link}} {{ p.date | date: "%a, %d %b %Y" }} 00:00:00 GMT - {% endfilter_for %} + {% endfor %} diff --git a/en/rss/releases.rss b/en/rss/releases.rss index e57df62d..3534b6fb 100644 --- a/en/rss/releases.rss +++ b/en/rss/releases.rss @@ -15,11 +15,12 @@ lang: en https://bitcoin.org/img/icons/logo_rss.png https://bitcoin.org/en/version-history - {% filter_for p in site.pages reversed sort_by:versionint category:release %} + {% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %} + {% for p in date_sorted_releases reversed %} - {{ p.title | htmlescape }} - https://bitcoin.org{{ p.url | replace:'.html','' }} - https://bitcoin.org{{ p.url | replace:'.html','' }} + {{ p.title | xmlescape }} + https://bitcoin.org{{ p.url }} + https://bitcoin.org{{ p.url }} {% if p.optional_date %} {{ p.optional_date | date: "%a, %d %b %Y" }} 00:00:00 GMT {% else %} @@ -27,6 +28,6 @@ lang: en {% warn "This release doesn't have optional_date set" %} {% endif %} - {% endfilter_for %} + {% endfor %} diff --git a/en/version-history.html b/en/version-history.html index 03589308..12717aea 100644 --- a/en/version-history.html +++ b/en/version-history.html @@ -11,14 +11,15 @@ breadcrumbs: - bcc - News --- +{% assign date_sorted_releases = site.releases | sort: 'optional_date', 'last' %}

Bitcoin Core version historyrss

    - {% filter_for p in site.pages reversed sort_by:versionint category:release %} + {% for p in date_sorted_releases reversed %}
  • {% if p.optional_date %}{{ p.optional_date | date:"%Y-%m-%d" }} - {% endif %}{{ p.title }}
    • - {% endfilter_for %} + {% endfor %}