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

[tpo/staging] give priority to this one
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 561f623463c26ad34cdb169df30aff1bca25b9a3 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 10:34:02 2019 +0100 give priority to this one --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 5ef6d31..c6df379 100644 --- a/.htaccess +++ b/.htaccess @@ -69,9 +69,9 @@ RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=301,L] # Download websites +RewriteRule ^download.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] -RewriteRule ^download.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^download.html(.*) /download [R=301,L] RewriteRule ^download/easy-download(.*) /download [R=301,L] RewriteRule ^download/download-easy(.*) /download [R=302,L]

1 0

[tpo/staging] Fix social media cards
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit c9b84ffbe0d7424db7d30098577d5acf8328f02a Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 09:17:31 2019 +0100 Fix social media cards --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 6a69444..4e7b067 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,7 +6,7 @@ <meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="/static/images/tor-project-logo-onions.png"/> +<meta name="twitter:image" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}"/> <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" />

1 0

[tpo/staging] take over the translation introduction
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 80922ed64f2640f831533da8c918c4155c0d9afe Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 10:37:48 2019 +0100 take over the translation introduction --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index c6df379..143faa1 100644 --- a/.htaccess +++ b/.htaccess @@ -47,6 +47,7 @@ RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRe # GetInvolved RewriteRule ^getinvolved/$ https://2019.www.torproject.org/getinvolved/volunteer [R=302,L] +RewriteRule ^getinvolved/translation.html.en$ https://tb-manual.torproject.org/becoming-tor-translator/ [R=302,L] RewriteRule ^getinvolved(.*) https://2019.www.torproject.org/getinvolved$1 [R=302,L] RewriteRule ^volunteer(.*) https://2019.www.torproject.org/getinvolved/volunteer$1 [R=302,L] RewriteRule ^tshirt(.*) https://2019.www.torproject.org/getinvolved/tshirt$1 [R=302,L]

1 0

[tpo/staging] Fix social media cards
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 2324049a6f370383b93f63052c690a6d6ce4ee6a Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 09:09:22 2019 +0100 Fix social media cards --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 4e7b067..6a69444 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,7 +6,7 @@ <meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}"/> +<meta name="twitter:image" content="/static/images/tor-project-logo-onions.png"/> <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" />

1 0

[tpo/staging] silly typo
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit abbdab1700b4b6d429a6c4de9941df60d2f39ee0 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 10:40:43 2019 +0100 silly typo --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 143faa1..25ae16b 100644 --- a/.htaccess +++ b/.htaccess @@ -70,7 +70,7 @@ RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=301,L] # Download websites -RewriteRule ^download.html.en#downloads-alpha$ /download/alpha [R=302,L] +RewriteRule ^torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] RewriteRule ^download.html(.*) /download [R=301,L]

1 0

[tpo/staging] Add locale for signature verification
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 931df91a22b71745f9668eabdb98188e2dffe6dd Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 10:43:09 2019 +0100 Add locale for signature verification --- templates/download.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/download.html b/templates/download.html index d27d14b..d5a2a29 100644 --- a/templates/download.html +++ b/templates/download.html @@ -45,7 +45,9 @@ </div> <div class="container justify-content-center mt-4"> <div class="row justify-content-center"> - <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"><a class="mx-auto" href="https://support.torproject.org/tbb/how-to-verify-signature/" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> + <i class="fas fa-signature display-5 text-primary pr-3"></i><p class="text-primary text-tpo"> + <a class="mx-auto" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> + </div> </div> <div class="container">

1 0

[tpo/staging] more legacy forwards
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit c31ddcfe3ea18c7870f2384313687d934b9274a0 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 11:15:16 2019 +0100 more legacy forwards --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 25ae16b..1254c39 100644 --- a/.htaccess +++ b/.htaccess @@ -21,7 +21,8 @@ RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R # Tor Browser RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] -RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser [R=301,L] +RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] +RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] # tordnsel

1 0

[tpo/staging] Update twitter card tags
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit a8d0ba51cd9057d2151f2fc2d3dfba87841fe817 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 10:57:35 2019 +0100 Update twitter card tags --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 3a50f32..a86eb82 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -10,7 +10,7 @@ <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> -<meta property="og:image" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}" /> +<meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> <link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0

[tpo/staging] Update twitter card tags
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 6eced28b440deee337fc23156bf8a03927c28b2a Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 10:45:45 2019 +0100 Update twitter card tags --- templates/meta.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/meta.html b/templates/meta.html index 4e7b067..3a50f32 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -3,10 +3,10 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}"> -<meta name="twitter:card" content="summary_large_image" /> +<meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}"/> +<meta name="twitter:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png"/> <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" />

1 0

[tpo/staging] Fix dropdown language button on tor safest
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 00cdf0c73d504c4ae95d0dd98a211214ee583105 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 13:59:25 2019 +0100 Fix dropdown language button on tor safest --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index f70cdd0..7fdf378 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -38,7 +38,7 @@ </div> <div class="btn-group pull-right"> {% if this.color == 'primary' %} - <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" class="btn btn-primary bg-primary dropdown dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% else %} <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% endif %}

1 0