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

[tpo/staging] pronouns found on previous peoples page
by emmapeel＠torproject.org 29 May '19

29 May '19

commit d38fedb41c241abb3121448b4b66c89d4161d4cf Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 27 09:18:51 2019 +0100 pronouns found on previous peoples page --- content/about/people/boklm/contents.lr | 2 +- content/about/people/ewyatt/contents.lr | 2 +- content/about/people/sajolida/contents.lr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/about/people/boklm/contents.lr b/content/about/people/boklm/contents.lr index cc2902d..df01f83 100644 --- a/content/about/people/boklm/contents.lr +++ b/content/about/people/boklm/contents.lr @@ -8,7 +8,7 @@ name: Nicolas Vigier --- nickname: boklm --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://www.torproject.org/images/pgp-key.png --- diff --git a/content/about/people/ewyatt/contents.lr b/content/about/people/ewyatt/contents.lr index b7a8322..c4c388d 100644 --- a/content/about/people/ewyatt/contents.lr +++ b/content/about/people/ewyatt/contents.lr @@ -8,7 +8,7 @@ name: Erin Wyatt --- nickname: ewyatt --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: /static/keys/ewyatt.txt --- diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index 56e6644..cddc3bc 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -8,7 +8,7 @@ name: sajolida --- nickname: sajolida --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/sajolida.txt ---

1 0

[tpo/staging] Fix download link in spanish
by emmapeel＠torproject.org 29 May '19

29 May '19

commit ee0e4fc9c4bbf128fc3732f6577502b1c3069434 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:12:03 2019 +0200 Fix download link in spanish --- templates/macros/downloads.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 6bddbb0..742e115 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -2,6 +2,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'torbrowser-install-win64-' + version + '_' + alt + '.exe' %} {% set download_link_32 = download_prefix + 'torbrowser-install-' + version + '_' + alt + '.exe' %} @@ -15,6 +17,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link = download_prefix + 'TorBrowser-' + version + '-osx64' + '_' + alt + '.dmg' %} {% set sig_link = download_link + '.asc' %} @@ -26,6 +30,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'tor-browser-linux64-' + version + '_' + alt + '.tar.xz' %} {% set download_link_32 = download_prefix + 'tor-browser-linux32-' + version + '_' + alt + '.tar.xz' %}

1 0

[tpo/staging] this file is needed to allow translation of databags labels (navbar)
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 28ae613c8e98513c421a3512b46dc008ec68951b Author: emma peel <emma.peel(a)riseup.net> Date: Wed Apr 24 14:59:32 2019 +0200 this file is needed to allow translation of databags labels (navbar) --- content/menu/contents.lr | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/content/menu/contents.lr b/content/menu/contents.lr new file mode 100644 index 0000000..34edc58 --- /dev/null +++ b/content/menu/contents.lr @@ -0,0 +1,16 @@ +_template: about.html +--- +section: About +--- +color: primary +--- +title: About +--- +body: + +Documentation +Press +Support +Jobs +Blog +Donate

1 0

[tpo/staging] Fix download link in spanish
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 329bab429f407f6d3ec89a89e96b07450503616b Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:10:11 2019 +0200 Fix download link in spanish --- templates/hero-download.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/hero-download.html b/templates/hero-download.html index 2be2ea6..954fb8c 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -12,6 +12,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + t.version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% if id == 'windows' %} {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %}

1 0

[tpo/staging] Fix source download page
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 48d4c4ca85de9765a13a940e89d0e380359d5a52 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 13:48:49 2019 +0200 Fix source download page Revert "Fix footer" This reverts commit 650dd7b1740585d45ae32a0abe9ce15f4b435b67. --- databags/versions.ini | 6 ------ templates/download-android.html | 10 +++------- templates/download-options.html | 1 + templates/download-tor.html | 37 ++++++++++++++----------------------- templates/macros/downloads.html | 8 ++++++++ 5 files changed, 26 insertions(+), 36 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index beb9132..72bd8cd 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,9 +15,3 @@ version = 0.3.5.8 [tor-alpha] version = 0.4.0.3-alpha - -[tor-win32-stable] -version = 0.2.4.22 - -[tor-win32-alpha] -version = 0.2.4.23 diff --git a/templates/download-android.html b/templates/download-android.html index 0466ae4..6dfea22 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -11,17 +11,13 @@ <div class="row"> <h4 class="mx-auto display-4 text-center text-white">{{ _('Get Tor Browser for Android.') }}</h4> </div> - </div> - <div class="d-none d-lg-block col-lg-4"> - <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </div> - </div> - <div class="row col-lg-10 mx-auto"> - <div class="col-lg-12 py-5 mt-5"> <div class="row"> <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> </div> <div class="row col-lg-10 mx-auto"> <div class="col-lg-12 py-5 mt-5"> diff --git a/templates/download-options.html b/templates/download-options.html index 8698e73..0bebe37 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -33,6 +33,7 @@ </td> </tr> {% endfor %} + {% set t = bag('versions', 'torbrowser-stable') %} </tbody> </table> </div> diff --git a/templates/download-tor.html b/templates/download-tor.html index fda525b..7d759ea 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -8,34 +8,25 @@ <table class="table"> <thead> <tr> - <th scope="col">OS</th> - <th scope="col">Stable</th> - <th scope="col">Unstable</th> + <th scope="col">Version</th> + <th></th> </tr> </thead> <tbody> {% set t = bag('versions', 'tor-stable') %} {% set a = bag('versions', 'tor-alpha') %} - {% set tw = bag('versions', 'tor-win32-stable') %} - {% set aw = bag('versions', 'tor-win32-alpha') %} - {% for id, item in bag('platforms').items() %} - {% if id == 'windows' %} - {% set download_link = 'https://dist.torproject.org/win32/tor-' + tw.version + '-win32.exe' %} - {% set sig_link = download_link + '.asc' %} - {% set alpha_download_link = 'https://dist.torproject.org/win32/tor-' + aw.version + '-win32.exe' %} - {% set alpha_sig_link = alpha_download_link + '.asc' %} - {% else %} - {% set download_link = 'https://dist.torproject.org/tor-' + t.version + '.tar.gz' %} - {% set sig_link = download_link + '.asc' %} - {% set alpha_download_link = 'https://dist.torproject.org/tor-' + a.version + '.tar.gz' %} - {% set alpha_sig_link = alpha_download_link + '.asc' %} - {% endif %} - <tr> - <td>{{ item.label }}</td> - <td><a href="{{ download_link }}">stable</a> (<a href="{{ sig_link }}">sig</a>)</td> - <td><a href="{{ alpha_download_link }}">alpha</a> (<a href="{{ alpha_sig_link }}">sig</a>)</td> - </tr> - {% endfor %} + {% set download_link = 'https://dist.torproject.org/tor-' + t.version + '.tar.gz' %} + {% set sig_link = download_link + '.asc' %} + {% set alpha_download_link = 'https://dist.torproject.org/tor-' + a.version + '.tar.gz' %} + {% set alpha_sig_link = alpha_download_link + '.asc' %} + <tr> + <td>{{ t.version }}</td> + <td class="text-right"><a href="{{ download_link }}">Download</a> (<a href="{{ sig_link }}">sig</a>)</td> + </tr> + <tr> + <td>{{ a.version }}</td> + <td class="text-right"><a href="{{ alpha_download_link }}">Download</a> (<a href="{{ alpha_sig_link }}">sig</a>)</td> + </tr> </tbody> </table> </div> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 742e115..71056cf 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -13,6 +13,14 @@ <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_windows_expert(version, win32) %} + {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} + {% set download_link_32 = download_prefix + 'tor-win32-' + win32 + '.zip' %} + {% set sig_link_32 = download_link_32 + '.asc' %} + + <a class="downloadLink" href="{{ download_link_32 }}">Download</a> (<a href="{{ sig_link_32 }}">sig</a>) +{% endmacro %} + {% macro render_mac(version, alt) %} {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %}

1 0

[tpo/staging] Merge pull request #19 from torproject/master
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 3602b9039685b86f88b296a988848eca68ad70c6 Merge: 988c3f7 48d4c4c Author: Antonela <hola(a)antonela.me> Date: Tue Apr 23 14:26:38 2019 -0300 Merge pull request #19 from torproject/master rebase .htaccess | 2 -- content/about/reports/2011-form-pc/contents.lr | 2 +- .../torbrowser/RecommendedTBBVersions/contents.lr | 6 +++- databags/versions.ini | 10 ++---- models/text.ini | 2 +- templates/download-android.html | 28 +++++++++------- templates/download-options.html | 1 + templates/download-tor.html | 37 ++++++++-------------- templates/download.html | 8 ++--- templates/hero-download.html | 13 +++++--- templates/macros/downloads.html | 14 ++++++++ 11 files changed, 67 insertions(+), 56 deletions(-)

1 0

[tpo/staging] Fix small bug in alternatives
by emmapeel＠torproject.org 29 May '19

29 May '19

commit d5a603d3037e74ac5dc8d2b7224f59123c58edbf Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:20:57 2019 +0200 Fix small bug in alternatives --- templates/hero-download.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index 954fb8c..c215de8 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -8,21 +8,22 @@ {% for id, item in bag('platforms').items() %} <div class="col-sm-6 col-md-3 py-3"> <div class="oval-2 bg-darker mx-auto"> + {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + t.version + '/' %} - {% if alt == 'en' %} - {% set alt = 'en-US' %} - {% elif alt == 'es' %} - {% set alt = 'es-ES' %} + {% if alt_l == 'en' %} + {% set alt_l = 'en-US' %} + {% elif alt_l == 'es' %} + {% set alt_l = 'es-ES' %} {% endif %} {% if id == 'windows' %} - {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %} + {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt_l + '.exe' %} {% set sig_link = download_link + '.asc' %} {% elif id == 'apple' %} - {% set download_link = download_prefix + 'TorBrowser-' + t.version + '-osx64' + '_' + alt + '.dmg' %} + {% set download_link = download_prefix + 'TorBrowser-' + t.version + '-osx64' + '_' + alt_l + '.dmg' %} {% set sig_link = download_link + '.asc' %} {% else %} - {% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt + '.tar.xz' %} + {% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt_l + '.tar.xz' %} {% set sig_link = download_link + '.asc' %} {% endif %} <a class="downloadLink" href="{{ download_link }}">

1 0

[tpo/staging] Add Tor Browser 8.5a11
by emmapeel＠torproject.org 29 May '19

29 May '19

commit e002d5fdb46119d34d2963cbefcf01a73c2d089c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 17 01:00:07 2019 +0200 Add Tor Browser 8.5a11 --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index ab83ca9..beb9132 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-03-23 win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a10 -release_date = 2019-03-23 +version = 8.5a11 +release_date = 2019-04-17 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/staging] Browser versions one per line
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 6bb7a1e6090c2c25dcec8da67b492eb0eaf446f1 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 19:27:28 2019 +0200 Browser versions one per line --- .../projects/torbrowser/RecommendedTBBVersions/contents.lr | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 56a3483..0ab95b1 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -4,4 +4,13 @@ _template: empty.html --- body: -["8.0.8", "8.0.8-MacOS", "8.0.8-Linux", "8.0.8-Windows", "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", "8.5a10-Windows"] +[ +"8.0.8", +"8.0.8-MacOS", +"8.0.8-Linux", +"8.0.8-Windows", +"8.5a10", +"8.5a10-MacOS", +"8.5a10-Linux", +"8.5a10-Windows" +]

1 0

[tpo/staging] Fix footer
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 650dd7b1740585d45ae32a0abe9ce15f4b435b67 Author: hiro <hiro(a)torproject.org> Date: Wed Apr 17 15:36:45 2019 +0200 Fix footer --- templates/download-android.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 6dfea22..0466ae4 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -11,9 +11,6 @@ <div class="row"> <h4 class="mx-auto display-4 text-center text-white">{{ _('Get Tor Browser for Android.') }}</h4> </div> - <div class="row"> - <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> - </div> </div> <div class="d-none d-lg-block col-lg-4"> <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> @@ -21,6 +18,13 @@ </div> <div class="row col-lg-10 mx-auto"> <div class="col-lg-12 py-5 mt-5"> + <div class="row"> + <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> + </div> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> <div class="col-md-6 col-sm-4 text-center p1"> <div class="row">

1 0