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

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

29 May '19

commit 9ee2422a17c5024fbd4c3f4a9cef767cfb1e3985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 16 21:35:53 2019 +0200 Add 8.5a11 to RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 0ab95b1..4a5c3ba 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,5 +12,9 @@ body: "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", -"8.5a10-Windows" +"8.5a10-Windows", +"8.5a11", +"8.5a11-MacOS", +"8.5a11-Linux", +"8.5a11-Windows" ]

1 0

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

29 May '19

commit cd25b15b02d07b8c76d866fecef526479dd9a916 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 21:31:44 2019 +0200 Update footer --- templates/download-android.html | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 6248c8a..6dfea22 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,19 +14,28 @@ <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"> <div class="row my-5"> - <div class="col-md-6 text-center"> - {% set t = bag('versions', 'torbrowser-alpha') %} - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" 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-1" 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> - <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-x86-multi.apk.asc"><small>sig</small></a> + <div class="col-md-6 col-sm-4 text-center p1"> + <div class="row"> + {% set t = bag('versions', 'torbrowser-alpha') %} + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" 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-1" 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> + <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-x86-multi.apk.asc"><small>sig</small></a> + </div> </div> - <div class="col-md-3 text-center"> + <div class="col-md-3 col-sm-4 text-center p1"> <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> </div> {% from "macros/downloads.html" import render_fdroid %} - <div class="col-md-3 text-center"> + <div class="col-md-3 col-sm-4 text-center p1"> <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>  </div> @@ -35,8 +44,5 @@ <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> </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>

1 0

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

29 May '19

commit 984abbacb023ac3e913fa631081d4825ada96ade Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 19:21:46 2019 +0200 Fix various typos --- content/about/reports/2011-form-pc/contents.lr | 2 +- .../projects/torbrowser/RecommendedTBBVersions/contents.lr | 11 +---------- models/text.ini | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index c9181ef..7d5b541 100644 --- a/content/about/reports/2011-form-pc/contents.lr +++ b/content/about/reports/2011-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2011 --- tags: FISCAL YEAR --- -title: 2011 Steate of MA Form PC +title: 2011 State of MA Form PC --- _hidden: yes --- diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 0ab95b1..56a3483 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -4,13 +4,4 @@ _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"] diff --git a/models/text.ini b/models/text.ini index 75e24ba..3d57509 100644 --- a/models/text.ini +++ b/models/text.ini @@ -4,4 +4,4 @@ label = Text [fields.body] label = Body -type = text +type = html

1 0

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

29 May '19

commit 4c0501626f8c2650e71696763ef3711f7a6499a3 Merge: e168cfa 4743c46 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 13:25:01 2019 -0300 Merge pull request #18 from torproject/master rebase databags/versions.ini | 10 ++++++++-- templates/download-android.html | 9 +++++---- templates/download-tor.html | 22 ++++++++++++++++++++-- templates/hero-download.html | 5 ++++- 4 files changed, 37 insertions(+), 9 deletions(-)

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

[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] 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] 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] 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] 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