tor-commits May 2019

tor-commits@lists.torproject.org

17 participants
2795 discussions

[tpo/staging] Merge branch 'master' of https://github.com/holantonela/tpo
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 387f14008901b0131610316a9eb116ae1178cefd Merge: dbc9857 7bd1eea Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:49:46 2019 -0300 Merge branch 'master' of https://github.com/holantonela/tpo assets/scss/_illos.scss | 15 +++++++++++++++ assets/scss/bootstrap.scss | 1 + assets/static/bootstrap.css | 11 +++++++++++ assets/static/bootstrap.css.map | 4 ++-- assets/static/js/fallback.js | 13 +++++++++++++ templates/download.html | 2 +- templates/home.html | 20 ++++++++++---------- templates/navbar.html | 2 +- 8 files changed, 54 insertions(+), 14 deletions(-)

1 0

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

29 May '19

commit b2e8c07a3d9825f69b47ea4b738bc4c43794fe30 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 17:50:18 2019 +0200 Fix templates --- databags/versions.ini | 6 +++--- templates/download-android.html | 9 +++++---- templates/hero-download.html | 5 ++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbba14e..e8dbb3e 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-25 +version = 8.5a11 +release_date = 2019-04-15 [torbrowser-develop-branch] version = maint-8.0 @@ -14,4 +14,4 @@ version = maint-8.0 version = 0.3.5.8 [tor-alpha] -version = 0.4.0.1-alpha +version = 0.4.0.3-alpha diff --git a/templates/download-android.html b/templates/download-android.html index b6ac863..fc33533 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -15,10 +15,11 @@ <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> - {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + {% set t = bag('versions', 'torbrowser-alpha') %} + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}</a> + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + {% from "macros/downloads.html" import render_fdroid %} + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> diff --git a/templates/hero-download.html b/templates/hero-download.html index 212c837..dfe9704 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -15,15 +15,18 @@ {% endif %} {% if id == 'windows' %} {% set download_link = download_prefix + 'torbrowser-install-win64-' + t.version + '_' + alt + '.exe' %} + {% set sig_link = download_link + '.asc' %} {% elif id == 'apple' %} {% set download_link = download_prefix + 'TorBrowser-' + t.version + '-osx64' + '_' + alt + '.dmg' %} + {% set sig_link = download_link + '.asc' %} {% else %} {% set download_link = download_prefix + 'tor-browser-linux64-' + t.version + '_' + alt + '.tar.xz' %} + {% set sig_link = download_link + '.asc' %} {% endif %} <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="#">sig</a></small></p> + <p><small><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> </div> </div> {% endfor %}

1 0

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

29 May '19

commit 3050853eb568e5abf815bbcf0fde7563bb270957 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:19:27 2019 +0200 Add source download page --- databags/versions.ini | 6 ++++++ templates/download-tor.html | 22 ++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 5fdd461..ab83ca9 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -15,3 +15,9 @@ 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-tor.html b/templates/download-tor.html index 686f452..fda525b 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -14,10 +14,28 @@ </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></td> - <td></td> + <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 %} </tbody> </table> </div>

1 0

[tpo/staging] Add png for svg fallback /download
by emmapeel＠torproject.org 29 May '19

29 May '19

commit e168cfa203d81a25deb40da7a23234380b974f81 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 13:24:04 2019 -0300 Add png for svg fallback /download --- assets/static/images/download/png/get-connected.png | Bin 0 -> 15182 bytes assets/static/images/download/png/get-connected(a)2x.png | Bin 0 -> 35598 bytes assets/static/images/download/png/get-connected(a)3x.png | Bin 0 -> 56569 bytes assets/static/images/download/png/stay-safe.png | Bin 0 -> 23398 bytes assets/static/images/download/png/stay-safe(a)2x.png | Bin 0 -> 53831 bytes assets/static/images/download/png/stay-safe(a)3x.png | Bin 0 -> 84316 bytes .../static/images/download/{ => svg}/get-connected.svg | 0 assets/static/images/download/{ => svg}/stay-safe.svg | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/download/png/get-connected.png b/assets/static/images/download/png/get-connected.png new file mode 100644 index 0000000..6375bb8 Binary files /dev/null and b/assets/static/images/download/png/get-connected.png differ diff --git a/assets/static/images/download/png/get-connected(a)2x.png b/assets/static/images/download/png/get-connected(a)2x.png new file mode 100644 index 0000000..21f8283 Binary files /dev/null and b/assets/static/images/download/png/get-connected(a)2x.png differ diff --git a/assets/static/images/download/png/get-connected(a)3x.png b/assets/static/images/download/png/get-connected(a)3x.png new file mode 100644 index 0000000..e6f5370 Binary files /dev/null and b/assets/static/images/download/png/get-connected(a)3x.png differ diff --git a/assets/static/images/download/png/stay-safe.png b/assets/static/images/download/png/stay-safe.png new file mode 100644 index 0000000..0c0a224 Binary files /dev/null and b/assets/static/images/download/png/stay-safe.png differ diff --git a/assets/static/images/download/png/stay-safe(a)2x.png b/assets/static/images/download/png/stay-safe(a)2x.png new file mode 100644 index 0000000..f49df98 Binary files /dev/null and b/assets/static/images/download/png/stay-safe(a)2x.png differ diff --git a/assets/static/images/download/png/stay-safe(a)3x.png b/assets/static/images/download/png/stay-safe(a)3x.png new file mode 100644 index 0000000..00e057f Binary files /dev/null and b/assets/static/images/download/png/stay-safe(a)3x.png differ diff --git a/assets/static/images/download/get-connected.svg b/assets/static/images/download/svg/get-connected.svg similarity index 100% rename from assets/static/images/download/get-connected.svg rename to assets/static/images/download/svg/get-connected.svg diff --git a/assets/static/images/download/stay-safe.svg b/assets/static/images/download/svg/stay-safe.svg similarity index 100% rename from assets/static/images/download/stay-safe.svg rename to assets/static/images/download/svg/stay-safe.svg

1 0

[tpo/staging] Merge remote-tracking branch 'anto/master'
by emmapeel＠torproject.org 29 May '19

29 May '19

commit a5e1f7e5725a0c33af45a0ee0a9b5930cd60d37c Merge: 2da591e 26fa04a Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 16:18:14 2019 +0200 Merge remote-tracking branch 'anto/master' content/download/tor/contents.lr | 13 +++++++++++++ templates/download-tor.html | 23 +++++++++++++++++++++++ templates/hero-download-tor.html | 6 ++++++ templates/hero-download.html | 5 ++--- 4 files changed, 44 insertions(+), 3 deletions(-)

1 0

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

29 May '19

commit b4a7f8c0078e1b8f5f97d3c3d76274d2f1c4f0a2 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:31:25 2019 +0200 Fix svg fallback --- templates/download.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/download.html b/templates/download.html index 61ec23c..0e4befb 100644 --- a/templates/download.html +++ b/templates/download.html @@ -1,8 +1,8 @@ <div class="container py-3"> <div class="row"> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/get-connected.svg'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/get-connected(a)3x.png'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> </div> <h3 class="text-primary">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> @@ -15,8 +15,8 @@ </div> </div> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/stay-safe.svg'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/stay-safe(a)3x.png'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> </div> <h3 class="text-primary">{{ _('Stay safe') }}</h3> <div class="row pl-3 pr-5 text-tpo">

1 0

[tpo/staging] Make other platforms discoverable
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 988c3f75e57b33cc44e67be0e9a00826b71a7ef6 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 14:16:28 2019 -0300 Make other platforms discoverable #29907 --- templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hero-download.html b/templates/hero-download.html index dfe9704..2be2ea6 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -39,7 +39,7 @@ </div> </div> <div class="row p-5"> - <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> + <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> <a class="mx-auto text-white py-3" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div>

1 0

[tpo/staging] Remove RecommendedTBBVersions redirect
by emmapeel＠torproject.org 29 May '19

29 May '19

commit df4fc612eb77dc607ebacb6e3cda498b243c1e15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 16 21:40:48 2019 +0200 Remove RecommendedTBBVersions redirect --- .htaccess | 2 -- 1 file changed, 2 deletions(-) diff --git a/.htaccess b/.htaccess index 9045e5e..7c5f189 100644 --- a/.htaccess +++ b/.htaccess @@ -31,8 +31,6 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] -# Bug 29951: redirect RecommendedTBBVersions until its format is fixed -RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$1 [R=302,L] RewriteRule ^projects/torbrowser/RecommendedTBBVersions - [L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects/gettor(.*) https://gettor.torproject.org/ [R=302,L]

1 0

[tpo/staging] Merge remote-tracking branch 'anto/master'
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 71faa51259a83a5a0af82b13518aa5da144837de Merge: 984abba 988c3f7 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 19:24:04 2019 +0200 Merge remote-tracking branch 'anto/master' templates/hero-download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Merge remote-tracking branch 'anto/master'
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 4743c462d280eb95fb1950586048e462c74b20f3 Merge: 3050853 fe37f17 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:19:45 2019 +0200 Merge remote-tracking branch 'anto/master' templates/download.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2019