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

[tpo/staging] this are all the same, we can save some lines
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 8c56b969b5e6975a5896fa3dfbe2ab932e7fffa4 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 17:47:24 2019 +0100 this are all the same, we can save some lines --- .htaccess | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.htaccess b/.htaccess index 354822d..df6ae3e 100644 --- a/.htaccess +++ b/.htaccess @@ -6,15 +6,7 @@ RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] # moved to /docs/ -RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] -RewriteRule ^docs/bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L] -RewriteRule ^docs/abuse(.*) https://2019.www.torproject.org/docs/abuse$1 [R=302,L] -RewriteRule ^docs/documentation(.*) https://2019.www.torproject.org/docs/documentation$1 [R=302,L] -RewriteRule ^docs/verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L] -RewriteRule ^docs/signing-keys(.*) https://2019.www.torproject.org/docs/signing-keys$1 [R=302,L] -RewriteRule ^docs/tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L] -RewriteRule ^docs/trademark-faq(.*) https://2019.www.torproject.org/docs/trademark-faq$1 [R=302,L] -RewriteRule ^docs/onion-services(.*) https://2019.www.torproject.org/docs/onion-services$1 [R=302,L] +RewriteRule ^docs/(.*).html.en https://2019.www.torproject.org/docs/$1.html.en [R=302,L] # Torbutton RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L]

1 0

[tpo/staging] catch also sponsors and history
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit abf73c844d34939efe69daba878d78d56b5d0365 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 16:50:01 2019 +0100 catch also sponsors and history --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b186061..354822d 100644 --- a/.htaccess +++ b/.htaccess @@ -3,6 +3,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople.html.en$ /about/people/ [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] +RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0

[tpo/staging] Fixing pronoun for wayward
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 38a3106f19e027c19a6d27389bd23ecbd20dbba6 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 20:36:21 2019 +0100 Fixing pronoun for wayward --- content/about/people/wayward/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/wayward/contents.lr b/content/about/people/wayward/contents.lr index f62e3df..10e860c 100644 --- a/content/about/people/wayward/contents.lr +++ b/content/about/people/wayward/contents.lr @@ -8,7 +8,7 @@ name: Maggie Haughey --- nickname: wayward --- -pronoun: https://pronoun.is/she +pronoun: https://pronoun.is/she?or=they --- twitter_handle: meochaidha ---

1 0

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

06 Apr '19

commit 283e5392f23ecb7df56c807f565c5988ddd7fcf1 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 18:32:10 2019 +0100 typo --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 43883f9..c790b18 100644 --- a/.htaccess +++ b/.htaccess @@ -7,6 +7,7 @@ RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] +RewriteRule ^documentation.html$ https://2019.www.torproject.org/docs/documentation.html [R=302,L] # Torbutton RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L] @@ -28,7 +29,7 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$1 [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] -RewriteRule ^projects/(.*) https://2019.www.torproject.org/projects/projects$1 [R=302,L] +RewriteRule ^projects(.*) https://2019.www.torproject.org/projects/projects$1 [R=302,L] #Pluggable Transports RewriteRule ^PT/?$ https://2019.www.torproject.org/docs/pluggable-transports [R=302,L]

1 0

[tpo/staging] Bug 29936: Remove RecommendedTBBVersions redirect
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 28fa9efc6ed72880eb13625aee4e434c4dcfae83 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 29 12:36:06 2019 +0100 Bug 29936: Remove RecommendedTBBVersions redirect --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index c790b18..678bf85 100644 --- a/.htaccess +++ b/.htaccess @@ -27,7 +27,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] -RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$1 [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects(.*) https://2019.www.torproject.org/projects/projects$1 [R=302,L]

1 0

[tpo/staging] Bug 29936: Don't redirect RecommendedTBBVersions
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 045f01f70c85dee582674fe5381fb161d91e832b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 29 12:55:33 2019 +0100 Bug 29936: Don't redirect RecommendedTBBVersions --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 678bf85..d13321a 100644 --- a/.htaccess +++ b/.htaccess @@ -27,6 +27,7 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions - [L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects(.*) https://2019.www.torproject.org/projects/projects$1 [R=302,L]

1 0

[tpo/staging] Update navbar toggle button
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit effb6aacd1913040a25b23e5243a6ac72ae340ae Author: hiro <hiro(a)torproject.org> Date: Sat Mar 30 21:59:14 2019 +0100 Update navbar toggle button --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 7fdf378..b922b12 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -40,7 +40,7 @@ {% if this.color == 'primary' %} <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"> + <button type="button" class="btn btn-dark bg-dark dropdown dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% endif %} {{ bag('alternatives', this.alt, 'language') }} </button>

1 0

[tpo/staging] Update to dropdown button
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 117ee3d42bea583c33485f7f9d5eba585cb1b27d Author: hiro <hiro(a)torproject.org> Date: Sun Mar 31 23:14:38 2019 +0200 Update to dropdown button --- templates/navbar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index b922b12..8c6a286 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -36,11 +36,11 @@ {% endfor %} </ul> </div> - <div class="btn-group pull-right"> + <div class="btn-group dropdown pull-right"> {% if this.color == 'primary' %} - <button type="button" class="btn btn-primary bg-primary dropdown dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> {% else %} - <button type="button" class="btn btn-dark bg-dark dropdown dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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 %} {{ bag('alternatives', this.alt, 'language') }} </button>

1 0

[tpo/staging] changed as per #29928
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit dc921bd600d5ff681f5d7d81439f7b40e6a7f71d Author: emma peel <emma.peel(a)riseup.net> Date: Fri Mar 29 14:22:09 2019 +0100 changed as per #29928 --- content/about/people/ssteele/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/ssteele/contents.lr b/content/about/people/ssteele/contents.lr index 10a1e94..09005cf 100644 --- a/content/about/people/ssteele/contents.lr +++ b/content/about/people/ssteele/contents.lr @@ -6,7 +6,7 @@ role:board --- name: Shari Steele --- -title: Board Director +title: Director --- nickname: ssteele ---

1 0

[tpo/staging] Test css fallback for icons
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 6a91ffe696cfc942e11dc1f56d2627ff0f9cdd5f Author: hiro <hiro(a)torproject.org> Date: Sun Mar 31 23:58:06 2019 +0200 Test css fallback for icons --- assets/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css | 1 + templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css b/assets/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css index 56c4e5f..bd74bb4 100644 --- a/assets/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css +++ b/assets/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css @@ -93,6 +93,7 @@ .oi-arrow-bottom:before { content:'\e008'; + background-image: url('/static/fonts/open-iconic/png/arrow-bottom-2x.png'); } .oi-arrow-circle-bottom:before { diff --git a/templates/navbar.html b/templates/navbar.html index b368dfe..8c6a286 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -55,7 +55,7 @@ {% set download = site.get('/download') %} <div class="pull-right"> <a class="btn btn-outline-light pull-right" href="{{ this.url_to(download)|url(alt=this.alt) }}"> - {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"><img src="{{ 'static/fonts/open-iconic/png/arrow-bottom.png-2x'|asseturl }}"></span> + {{ _("Download Tor Browser") }}<span class="oi oi-arrow-bottom ml-2 p-1" title="icon arrow-bottom" aria-hidden="true"></span> </a> </div> </nav>

1 0