June 2019 - tor-commits - lists.torproject.org

[lego/master] Fix download issue in footer and navbar
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit c730094cffc998dfbae933e980925f0ec4370674 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:59:25 2019 +0200 Fix download issue in footer and navbar --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index bff7f34..e42f109 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,7 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - {% if download == 'None' %} + {% if download == None %} <a class="btn text-primary bg-white btn-light pull-right mt-2" href="https://www.torproject.org/download/"> {% else %} <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}">

1 0

[tor/release-0.4.1] Light changelog edits
by nickm＠torproject.org 25 Jun '19

25 Jun '19

commit d2c360c5336b43ba89c077f55461227420d14647 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 25 09:58:32 2019 -0400 Light changelog edits --- ChangeLog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65bb0ca9d..5bfce1ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,7 @@ Changes in version 0.4.1.3-alpha - 2019-06-25 hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. - Skip test_rebind on macOS in Travis, because it is unreliable on macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. - - Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental + - Skip test_rebind when the TOR_SKIP_TEST_REBIND environment variable is set. Fixes bug 30713; bugfix on 0.3.5.1-alpha. o Minor bugfixes (directory authorities): @@ -37,10 +37,10 @@ Changes in version 0.4.1.3-alpha - 2019-06-25 local file. Fixes bug 30781; bugfix on 0.2.0.8-alpha. o Minor bugfixes (pluggable transports): - - Always publish bridge pluggable transport information in the extra - info descriptor, even if ExtraInfoStatistics is 0. This - information is needed by BridgeDB. Fixes bug 30956; bugfix - on 0.4.1.1-alpha. + - When running as a bridge with pluggable transports, always publish + pluggable transport information in our extrainfo descriptor, even + if ExtraInfoStatistics is 0. This information is needed by + BridgeDB. Fixes bug 30956; bugfix on 0.4.1.1-alpha. o Documentation: - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md.

1 0

[tor/release-0.4.1] Fold 30956 into changelog; update date
by nickm＠torproject.org 25 Jun '19

25 Jun '19

commit 1d3a2c66581d40096e3ce843213ee9aebca55873 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 25 09:52:32 2019 -0400 Fold 30956 into changelog; update date --- ChangeLog | 8 +++++++- changes/bug30956 | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fb555c63..65bb0ca9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.4.1.3-alpha - 2019-06-24 +Changes in version 0.4.1.3-alpha - 2019-06-25 Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous alpha, most of them from earlier release series. @@ -36,6 +36,12 @@ Changes in version 0.4.1.3-alpha - 2019-06-24 annotation. We think this bug can only be triggered by modifying a local file. Fixes bug 30781; bugfix on 0.2.0.8-alpha. + o Minor bugfixes (pluggable transports): + - Always publish bridge pluggable transport information in the extra + info descriptor, even if ExtraInfoStatistics is 0. This + information is needed by BridgeDB. Fixes bug 30956; bugfix + on 0.4.1.1-alpha. + o Documentation: - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. Closes ticket 30630. diff --git a/changes/bug30956 b/changes/bug30956 deleted file mode 100644 index 8f52a81de..000000000 --- a/changes/bug30956 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (pluggable transports): - - Always publish bridge pluggable transport information in the extra info - descriptor, even if ExtraInfoStatistics is 0. This information is - needed by BridgeDB. Fixes bug 30956; bugfix on 0.4.1.1-alpha.

1 0

[lego/master] Fix download issue in footer and navbar
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit b78689989cb5f39c9fdd672fd0eea21461a5708f Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:53:29 2019 +0200 Fix download issue in footer and navbar --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 4ed16ff..ca26027 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -55,7 +55,7 @@ </div> {% set download = site.get('/download') %} <div class="pull-right"> - {% if download == 'None' %} + {% if download == None %} <a class="btn btn-outline-light pull-right" href="https://www.torproject.org/download/"> {% else %} <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}">

1 0

[lego/master] Fix download issue in footer
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit dd1655b879b6b2ff10c187aaba74ddc16733aaf6 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:48:48 2019 +0200 Fix download issue in footer --- templates/footer.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index cbeb039..bff7f34 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -9,7 +9,12 @@ <h2 class="text-white text-bold">{{ _('Download Tor Browser') }}</h2> <p class="text-white">{{ _('Download Tor Browser to experience real private browsing without tracking, surveillance, or censorship.') }}</p> {% set download = site.get('/download') %} - <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}"> + {% if download == 'None' %} + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="https://www.torproject.org/download/"> + {% else %} + <a class="btn text-primary bg-white btn-light pull-right mt-2" href="{{ this.url_to(download, alt=this.alt) }}"> + {% endif %} + {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png-purple"></i> </a> </div>

1 0

[lego/master] Fix download issue in navbar
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit 6e8d6be9f9214608851a8e862ce66befad7a1690 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:47:34 2019 +0200 Fix download issue in navbar --- templates/navbar.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 928cf99..4ed16ff 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -54,6 +54,14 @@ </div> </div> {% set download = site.get('/download') %} - {{ download }} + <div class="pull-right"> + {% if download == 'None' %} + <a class="btn btn-outline-light pull-right" href="https://www.torproject.org/download/"> + {% else %} + <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> + {% endif %} + {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i> + </a> + </div> </nav> </div>

1 0

[lego/master] Add footer macro
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit 763a1dbd2fcc89881d52d4887f38dad3910c8d68 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:43:45 2019 +0200 Add footer macro --- templates/macros/footer.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/macros/footer.html b/templates/macros/footer.html new file mode 100644 index 0000000..90b9dfd --- /dev/null +++ b/templates/macros/footer.html @@ -0,0 +1,3 @@ +{% macro render_faq() %} + <a href="https://www.torproject.org/docs/trademark-faq" target="_blank" class="text-primary text-light"><u>FAQ</u></a> +{% endmacro %}

1 0

[lego/master] Set download
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit ac4ebcb14729e17b51e31de6535609937bfaa038 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:39:26 2019 +0200 Set download --- templates/navbar.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 0e7287d..928cf99 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -54,12 +54,6 @@ </div> </div> {% set download = site.get('/download') %} - {% if download %} - <div class="pull-right"> - <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> - {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i> - </a> - </div> - {% endif %} + {{ download }} </nav> </div>

1 0

[lego/master] Add rule in navbar to work for other websites refactor
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit 3e96fb915401752c7db503417f28553531b1d6a0 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:23:57 2019 +0200 Add rule in navbar to work for other websites refactor --- templates/navbar.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 5714435..0e7287d 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -54,12 +54,12 @@ </div> </div> {% set download = site.get('/download') %} - <div class="pull-right"> - {% if this.url_to(download) %} + {% if download %} + <div class="pull-right"> <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i> </a> - {% endif %} - </div> + </div> + {% endif %} </nav> </div>

1 0

[lego/master] Add rule in navbar to work for other websites
by hiro＠torproject.org 25 Jun '19

25 Jun '19

commit 14f6638b26cb3032202e87c1382583647ba6bbb6 Author: hiro <hiro(a)torproject.org> Date: Tue Jun 25 15:21:37 2019 +0200 Add rule in navbar to work for other websites --- templates/navbar.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/navbar.html b/templates/navbar.html index 71b4738..5714435 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -55,9 +55,11 @@ </div> {% set download = site.get('/download') %} <div class="pull-right"> + {% if this.url_to(download) %} <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> {{ _("Download Tor Browser") }}<i class="ml-2 pt-1 fas fa-arrow-down-png"></i> </a> + {% endif %} </div> </nav> </div>

1 0