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

[tpo/staging] Fix typo "Steate" to "State of MA"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 9e8bd6e134899443baf61d5c7101950dacc2bc18 Merge: 0c73159 d585f84 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 13:10:36 2019 +0200 Fix typo "Steate" to "State of MA" content/about/reports/2013-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 83b23b6e9e43c7ef8308ea404dc790910319836a Merge: 003b828 0dc1c2c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:53:49 2019 +0200 Replace link to "How to report bugs or feedback" templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Set Tor Browser for Android version to 8.5.6
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit b23afc4367808fdd41f4ad584c8b210e81514941 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 9 17:09:26 2019 +0200 Set Tor Browser for Android version to 8.5.6 Set a separate version number on Android. We should revert this when the next stable release is published on all platforms. --- databags/versions.ini | 3 +++ templates/download-android.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 3a9ee37..8678372 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -2,6 +2,9 @@ version = 8.5.5 win32 = 0.4.1.5 +[torbrowser-stable-android] +version = 8.5.6 + [torbrowser-alpha] version = 9.0a6 diff --git a/templates/download-android.html b/templates/download-android.html index 71eb856..dee3912 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -16,7 +16,7 @@ </div> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> - {% set t = bag('versions', 'torbrowser-stable') %} + {% set t = bag('versions', 'torbrowser-stable-android') %} <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a> <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a>

1 0

[tpo/staging] Replace databag with macro
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 7d805317583586b4c2006c8972c4c235a1caebe5 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Sat Sep 7 08:15:45 2019 -0400 Replace databag with macro Generate Android links with a macro instead of hard-coding in a databag. --- databags/download-tb-for-android-alpha.ini | 14 -------------- templates/download-options.html | 28 +++++++++++++++++++++------- templates/macros/downloads.html | 7 +++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/databags/download-tb-for-android-alpha.ini b/databags/download-tb-for-android-alpha.ini deleted file mode 100644 index 5006897..0000000 --- a/databags/download-tb-for-android-alpha.ini +++ /dev/null @@ -1,14 +0,0 @@ -[Google Play] -url = https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp… - -[arch64] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… - -[arm] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… - -[x86] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… diff --git a/templates/download-options.html b/templates/download-options.html index c515669..e0edd8e 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -44,13 +44,27 @@ </tr> </thead> <tbody> - {% for id, item in bag('download-tb-for-android-alpha').items() %} - <tr> - <td> - <a href="{{ item.url }}">{{ id }}</a>{% if item.sig %} (<a href="{{ item.sig }}">sig</a>){% endif %} - </td> - </tr> - {% endfor %} + <tr> + <td> + <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">Google Play</a> + </td> + </tr> + {% from "macros/downloads.html" import render_android %} + <tr> + <td> + {{ render_android(t.version, "aarch64") }} + </td> + </tr> + <tr> + <td> + {{ render_android(t.version, "armv7") }} + </td> + </tr> + <tr> + <td> + {{ render_android(t.version, "x86") }} + </td> + </tr> </tbody> </table> </div> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index d743245..7581aca 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -49,6 +49,13 @@ <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_64 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) {% endmacro %} +{% macro render_android(version, arch) %} + {% set download_link = 'https://dist.torproject.org/torbrowser/' + version + '/' + 'tor-browser-' + version + '-android-' + arch + '-multi.apk' %} + {% set sig_link = download_link + '.asc' %} + + <a href="{{ download_link }}">{{ arch }}</a> (<a href="{{ sig_link }}">sig</a>) +{% endmacro %} + {% macro render_fdroid() %} <small class="badge-pill badge-dark mx-1 nick">S00N</small> {% endmacro %}

1 0

[tpo/staging] Fix "Steate" to "State of MA"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit b04d1a69cb5b80bb3e0ed825500f694f1a4d5da8 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Wed Sep 11 08:20:14 2019 +0000 Fix "Steate" to "State of MA" Fix second issue on #29945 --- content/about/reports/2012-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2012-form-pc/contents.lr b/content/about/reports/2012-form-pc/contents.lr index 7a4ac7b..4adebdc 100644 --- a/content/about/reports/2012-form-pc/contents.lr +++ b/content/about/reports/2012-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2012 --- tags: AUDIT --- -title: 2012 Steate of MA Form PC +title: 2012 State of MA Form PC --- _hidden: yes ---

1 0

[tpo/staging] Update trademark FAQ link in footer
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 6368b1b91f9cf373048c9f13d1af091c5389f72d Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sun Sep 8 07:37:56 2019 +0530 Update trademark FAQ link in footer will-fix https://dip.torproject.org/web/tpo/issues/39 partly --- templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/footer.html b/templates/macros/footer.html index 90b9dfd..e3c90c8 100644 --- a/templates/macros/footer.html +++ b/templates/macros/footer.html @@ -1,3 +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> + <a href="https://www.torproject.org/about/trademark/" target="_blank" class="text-primary text-light"><u>FAQ</u></a> {% endmacro %}

1 0

[tpo/staging] replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 003b8280668fdc791a07dcb3dc56d291977345eb Merge: 4f51cb4 6368b1b Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:51:31 2019 +0200 replace link to "How to report bugs or feedback" templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Fix "Steate" to "State of MA"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit d585f84c6471f89219384d155a9abb6ea1b10a13 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Wed Sep 11 08:18:33 2019 +0000 Fix "Steate" to "State of MA" Second issue on #29945 --- content/about/reports/2013-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/reports/2013-form-pc/contents.lr b/content/about/reports/2013-form-pc/contents.lr index 25717ed..b24caac 100644 --- a/content/about/reports/2013-form-pc/contents.lr +++ b/content/about/reports/2013-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2013 --- tags: AUDIT --- -title: 2013 Steate of MA Form PC +title: 2013 State of MA Form PC --- _hidden: yes ---

1 0

[tpo/staging] Merge branch 'fix-24-update-fdroid-link'
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit a6c15f8fed4d76ea2482e401ef7ff141e47b972c Merge: 9e8bd6e db771d9 Author: gus <gus(a)torproject.org> Date: Wed Sep 11 17:16:41 2019 -0400 Merge branch 'fix-24-update-fdroid-link' Fix https://dip.torproject.org/web/tpo/issues/24 templates/download-android.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 4f51cb429be74696ddfa54aba40e53cac1f672e7 Merge: 4bdc8bb cce3a1c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:50:09 2019 +0200 replace link to "How to report bugs or feedback" close https://github.com/torproject/tpo/pull/57 templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0