- tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 34242: Fix creation of Linux containers
by sysrqb＠torproject.org 18 May '20

18 May '20

commit e9fa09b87bd633f10cfeca2797839662138d5d39 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 17 18:59:06 2020 +0000 Bug 34242: Fix creation of Linux containers `0.9.7.9+deb7u8` is not available anymore for `apt`. Take `0.9.7.9+deb7u9` from now on. --- projects/debootstrap-image/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index f7b9e57..8e83d81 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -39,17 +39,17 @@ pre: | targets: wheezy-amd64: var: - minimal_apt_version: '0.9.7.9+deb7u8' + minimal_apt_version: '0.9.7.9+deb7u9' # https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/ apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt - apt_package_filename: apt_0.9.7.9+deb7u8_amd64.deb - apt_package_sha256sum: 83dcdb3f9c11df28b30b85bbb9dec341effbf36ee881a04dece3390082080761 - apt_utils_package_filename: apt-utils_0.9.7.9+deb7u8_amd64.deb - apt_utils_package_sha256sum: 91a4d0ec92a32f13e3acb37f71546d48c51a0df25f3b9eb6a96b73dfc93a11ed - libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u8_amd64.deb - libapt_inst_package_sha256sum: 181c9c21e1b33496b251fc76ba8ed04acbb8e23006909d27795bbc287eddd027 - libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u8_amd64.deb - libapt_pkg_package_sha256sum: b360dfb5a65ac2f7b81a2551d8a520ba2265785537d6d669869a159888b81999 + apt_package_filename: apt_0.9.7.9+deb7u9_amd64.deb + apt_package_sha256sum: b8a218da2ae21979323dd02551d983938d94308ac56930a2d238e822f062dc61 + apt_utils_package_filename: apt-utils_0.9.7.9+deb7u9_amd64.deb + apt_utils_package_sha256sum: d635a166aae03b24cdabe277bb46d584156836637c0b9bef2220fb0bc0928e40 + libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u9_amd64.deb + libapt_inst_package_sha256sum: 332083172e00d39e55dec4c7078c3522989e45e12b0a1306889e90b8e2c0a0db + libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u9_amd64.deb + libapt_pkg_package_sha256sum: c3ae83c4ea691074250bf6fb175e71042c4bb7418bf19779ceda0a53eea0a257 container: suite: wheezy

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_34242'
by sysrqb＠torproject.org 18 May '20

18 May '20

commit e202334a89191016e6419fe5cbedd965727b3103 Merge: 2c48c71 e9fa09b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 19:28:48 2020 +0000 Merge remote-tracking branch 'gktpo/bug_34242' projects/debootstrap-image/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[manual/master] Update lego
by gus＠torproject.org 18 May '20

18 May '20

commit 25ed92e7a84f367d16b97db5765d9c6628a3c6e4 Author: gus <gus(a)torproject.org> Date: Mon May 18 14:55:27 2020 -0400 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index ea7cf7f..7bb98ba 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ea7cf7f010c557558ba9e7ce8aa1efb67035f63c +Subproject commit 7bb98ba753539250d3346ad559f0279b76dfb0fb

1 0

[community/master] Update lego
by gus＠torproject.org 18 May '20

18 May '20

commit 4260edbbb5f391ceda75e2c55411f4c29343594c Author: gus <gus(a)torproject.org> Date: Mon May 18 14:54:18 2020 -0400 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index ea7cf7f..7bb98ba 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit ea7cf7f010c557558ba9e7ce8aa1efb67035f63c +Subproject commit 7bb98ba753539250d3346ad559f0279b76dfb0fb

1 0

[lego/master] Bring capitalize back to headers
by antonela＠torproject.org 18 May '20

18 May '20

commit 7bb98ba753539250d3346ad559f0279b76dfb0fb Author: Antonela <hola(a)antonela.me> Date: Mon May 18 15:53:19 2020 -0300 Bring capitalize back to headers --- templates/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/header.html b/templates/header.html index 866edad..3e4b29b 100644 --- a/templates/header.html +++ b/templates/header.html @@ -12,10 +12,10 @@ <div class="row"> <div class="col-12 content-center pt-5"> <div class="row"> - <h6 class="mx-auto text-white">{% block section %}{{ this.section }}{% endblock %}</h6> + <h6 class="mx-auto text-white text-capitalize">{% block section %}{{ this.section }}{% endblock %}</h6> </div> <div class="row pb-5"> - <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2> + <h2 class="mx-auto display-3 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2> </div> </div> </div>

1 0

[community/master] Breadcrumbs are back
by antonela＠torproject.org 18 May '20

18 May '20

commit 50083f476e7f14846d13fde0e53f72f6ba113458 Author: Antonela <hola(a)antonela.me> Date: Mon May 18 15:39:11 2020 -0300 Breadcrumbs are back \o/ --- templates/two-columns-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index c5c3757..1b4883a 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -1,4 +1,4 @@ - +{% include 'breadcrumb.html' %} <div class="row"> {% include 'sidenav.html' %}

1 0

[manual/master] Update lego
by gus＠torproject.org 18 May '20

18 May '20

commit c1fcb8b5fbe31b2d05e2dc943891911c0691dc13 Author: gus <gus(a)torproject.org> Date: Mon May 18 14:32:27 2020 -0400 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f2289b..ea7cf7f 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit ea7cf7f010c557558ba9e7ce8aa1efb67035f63c

1 0

[community/master] Update lego
by gus＠torproject.org 18 May '20

18 May '20

commit 4715a6070e55596a90599f23918419d89c975a10 Author: gus <gus(a)torproject.org> Date: Mon May 18 14:31:08 2020 -0400 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f2289b..ea7cf7f 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit ea7cf7f010c557558ba9e7ce8aa1efb67035f63c

1 0

[lego/master] Merge branch 'gus/lego-breadcrumb'
by gus＠torproject.org 18 May '20

18 May '20

commit ea7cf7f010c557558ba9e7ce8aa1efb67035f63c Merge: 7f2289b dd43007 Author: gus <gus(a)torproject.org> Date: Mon May 18 14:18:08 2020 -0400 Merge branch 'gus/lego-breadcrumb' templates/breadcrumb.html | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)

1 0

[lego/master] Fix breadcrumb for lektor and bootstrap. Thanks @eeshangarg
by gus＠torproject.org 18 May '20

18 May '20

commit dd4300733cd505681b40ae1be212148d0094ce9a Author: gus <gus(a)torproject.org> Date: Mon May 4 22:40:53 2020 -0400 Fix breadcrumb for lektor and bootstrap. Thanks @eeshangarg --- templates/breadcrumb.html | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html index 735d915..34ab2e5 100644 --- a/templates/breadcrumb.html +++ b/templates/breadcrumb.html @@ -1,7 +1,19 @@ <nav aria-label="breadcrumb"> - <ol class="breadcrumb bg-light m-0 small"> - {% from "macros/parent.html" import render_parents %} - {{ render_parents(this) }} - <li class="breadcrumb-item active" aria-current="page">{{ this.title }}</li> - </ol> +<ol class="breadcrumb bg-light m-0 small"> + {% set crumbs = [] %} + {% set current = {'crumb': this} %} + {% for i in this._path.split("/") %} + {% if current.crumb is not none %} + {% if crumbs.insert(0, current.crumb) %}{% endif %} + {% if current.update({"crumb": current.crumb.parent}) %}{% endif %} + {% endif %} + {% endfor %} + {% for crumb in crumbs %} + {% if this._path == crumb._path %} + <li class="breadcrumb-item active">{{ crumb.title }}</li> + {% else %} + <li class="breadcrumb-item" aria-current="page"><a href="{{ crumb|url }}">{{ crumb.title }}</a></li> + {% endif %} + {% endfor %} +</ol> </nav>

1 0