- tor-commits - lists.torproject.org

[tpo/staging] Merge pull request #13 from torproject/master
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 32863000150d73d1bf195f1952c013d1c3fe4195 Merge: 7918445 2f1e281 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:05:24 2019 -0300 Merge pull request #13 from torproject/master rebase .htaccess | 13 ++++++++++++- templates/download-android.html | 2 +- templates/macros/people.html | 1 + 3 files changed, 14 insertions(+), 2 deletions(-)

1 0

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

06 Apr '19

commit 2f1e2819904f578107da9fb158905cf0967f64a7 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 17:15:44 2019 +0100 Update htaccess --- .htaccess | 3 +++ templates/macros/people.html | 1 + 2 files changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index 2ff0d64..6987237 100644 --- a/.htaccess +++ b/.htaccess @@ -60,6 +60,9 @@ RewriteRule ^support(.*) https://support.torproject.org [R=301,L] # Newsletter RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] +# Press +RewriteRule ^press/press(.*) /press [R=302,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] diff --git a/templates/macros/people.html b/templates/macros/people.html index 22b0121..18e3285 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -18,6 +18,7 @@ {% if item.image %} <picture> <img src="{{ item.image|asseturl }}" class="rounded-circle float-left image-thumb" alt="{{ item.nickname }}"> + </picture> {% else %} <img src="{{ '/static/images/people/no_photo.png'|asseturl }}" class="rounded-circle float-left image-thumb" alt="no-photo"> {% endif %}

1 0

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

06 Apr '19

commit b97ff2a8a83a137d781feb3e6942c66deb849682 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:41:21 2019 +0100 Localize 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 206dd76..adb2653 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <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="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.')" }}> <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" />

1 0

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

06 Apr '19

commit a89ea438ae72b46c4f32b3173a9e621390ac8cef Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:42:20 2019 +0100 Localize 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 adb2653..ab0eb74 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -8,7 +8,7 @@ <meta name="twitter:creator" content="@torproject" /> <meta name="twitter:image:src" 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: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 }}" /> <link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}">

1 0

[tpo/staging] Merge and update
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit cbb891e76ec0f877764927f67dde495f8373a7f1 Merge: 0b25274 086b430 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:32:28 2019 +0100 Merge and update content/about/sponsors/DARPA-penn/contents.lr | 2 +- templates/meta.html | 1 + templates/people.html | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-)

1 0

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

06 Apr '19

commit fcc27d23fb03f3c19616988bd5aaffc6a7c3594e Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 19:02:21 2019 +0100 Localize 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 af7e6b3..1ca3373 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,7 +6,7 @@ <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image:src" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}"/> +<meta name="twitter:image:src" 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] fix people's page link to list
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 086b43009437f53e65a19a0131b36bec20f68a17 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:29:58 2019 -0300 fix people's page link to list --- templates/people.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/people.html b/templates/people.html index fba0466..abb3818 100644 --- a/templates/people.html +++ b/templates/people.html @@ -27,8 +27,8 @@ <div class="row justify-content-center"> <h4 class="text-primary display-5">{{ _('Join Our Team') }}</h4> <p class="text-center">{{ _("Even if we aren't hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you're a developer, we welcome you to sign up for our dev mailing list to see what we're up to.") }}</p> - <button class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> + <a class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> {{ _("Sign up for tor-dev") }}<i class="oi oi-arrow-right pl-3" title="icon arrow-right" aria-hidden="true"></i> - </button> + </a> </div> </div>

1 0

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

06 Apr '19

commit 560f1c0847018e0b7062f8cc71828310011b7bcd Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:45:09 2019 +0100 Localize social media cards --- templates/meta.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/meta.html b/templates/meta.html index ab0eb74..af7e6b3 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,14 +2,14 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <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="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}"> <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> <meta name="twitter:image:src" 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." /> +<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 }}" /> <link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}">

1 0

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

06 Apr '19

commit 581e7e586b49f308ea9d0ee25b1b8556fff90719 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 19:06:00 2019 +0100 Localize 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 1ca3373..025c3fd 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,7 +6,7 @@ <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image:src" 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] Fix social media cards
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 6afb92bb90f6a7a34136d95a2cf86dc51607d652 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 21:01:10 2019 +0100 Fix social media cards --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index 6987237..4daf923 100644 --- a/.htaccess +++ b/.htaccess @@ -3,7 +3,6 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] -RewriteRule ^about/sponsors(.*) /about/sponsors$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0