- tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge branch 'bug29959_040_squashed' into maint-0.4.0
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit d016bbaa7dfb3586c682c0070b79e174e8a73c19 Merge: 42aae0e69 8e961b217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:26:47 2019 -0400 Merge branch 'bug29959_040_squashed' into maint-0.4.0 changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0

[tpo/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit 0afd5bf53cf8d2b1dc86a0b47283847a998b38ed Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:23:04 2019 +0200 Update to script in line --- assets/static/js/download.js | 16 ++++++++++++++++ templates/footer.html | 2 +- templates/meta.html | 1 - templates/script-download.html | 14 -------------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/assets/static/js/download.js b/assets/static/js/download.js new file mode 100644 index 0000000..8ce7625 --- /dev/null +++ b/assets/static/js/download.js @@ -0,0 +1,16 @@ +$(".downloadLink").click( + function(e) { + e.preventDefault(); + + locale = window.location.href.split('/')[3]; + //open download link in new page + window.open( $(this).attr("href") ); + url = "/thank-you/" + //redirect current page to success page + if (locale != "download") { + url = "/" + locale + url + } + window.location=url; + window.focus(); + } +); diff --git a/templates/footer.html b/templates/footer.html index 63080db..5602948 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -89,5 +89,5 @@ <script src="{{ '/static/js/scrollspy.min.js'|asseturl }}" ></script> <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> - {% include 'script-download.html' %} + <script src="{{ '/static/js/download.js'|asseturl }}" ></script> </div> diff --git a/templates/meta.html b/templates/meta.html index ff32484..a86eb82 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,7 +1,6 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> -<meta http-equiv="Content-Security-Policy" content="base-uri 'self'"> <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" /> diff --git a/templates/script-download.html b/templates/script-download.html deleted file mode 100644 index ce605ea..0000000 --- a/templates/script-download.html +++ /dev/null @@ -1,14 +0,0 @@ -<script> - $(".downloadLink").click( - function(e) { - e.preventDefault(); - - //open download link in new page - window.open( $(this).attr("href") ); - - //redirect current page to success page - window.location="{{ '/thank-you'|url(alt=this.alt) }}"; - window.focus(); - } - ); -</script>

1 0

[tpo/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit a989ff9529451bce20b1d047da67866d51232052 Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:05:28 2019 +0200 Update to script in line --- assets/static/js/download.js | 12 ------------ templates/meta.html | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/assets/static/js/download.js b/assets/static/js/download.js deleted file mode 100644 index 17a5d88..0000000 --- a/assets/static/js/download.js +++ /dev/null @@ -1,12 +0,0 @@ -$(".downloadLink").click( - function(e) { - e.preventDefault(); - - //open download link in new page - window.open( $(this).attr("href") ); - - //redirect current page to success page - window.location="{{ '/thank-you'|url(alt=this.alt) }}"; - window.focus(); - } -); diff --git a/templates/meta.html b/templates/meta.html index ff32484..5de33ec 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,6 +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 http-equiv="Content-Security-Policy" content="base-uri 'self'"> + <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" />

1 0

[tpo/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit 9392491c29d3d35e484beaf029c0bc510cecf5bd Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 01:05:53 2019 +0200 Update to script in line --- templates/meta.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 5de33ec..ff32484 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,7 +2,6 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> <meta http-equiv="Content-Security-Policy" content="base-uri 'self'"> - <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" />

1 0

[tpo/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit 2c9b200a176a63dc029ee841f604e6fafe322682 Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 00:48:24 2019 +0200 Update to script in line --- templates/meta.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/meta.html b/templates/meta.html index d87b415..ff32484 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,8 +1,7 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> -<meta http-equiv="Content-Security-Policy" content="script-src 'self' https://torproject.org 'sha256-FqLmSOREzRHwnNg/O6ZAfzLKaIPr6c5coXumA9M00Hg='"> -<meta http-equiv="Content-Security-Policy" content="script-src 'unsafe-inline'"> +<meta http-equiv="Content-Security-Policy" content="base-uri 'self'"> <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" />

1 0

[tpo/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit ff751a49f3ccefdf0aa4328b169378c7a8fb4a6d Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 00:40:44 2019 +0200 Update to script in line --- templates/meta.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index ddbd810..d87b415 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,6 +1,8 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> +<meta http-equiv="Content-Security-Policy" content="script-src 'self' https://torproject.org 'sha256-FqLmSOREzRHwnNg/O6ZAfzLKaIPr6c5coXumA9M00Hg='"> +<meta http-equiv="Content-Security-Policy" content="script-src 'unsafe-inline'"> <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" /> @@ -11,7 +13,6 @@ <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="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> -<meta http-equiv="Content-Security-Policy" content="script-src 'sha256-FqLmSOREzRHwnNg/O6ZAfzLKaIPr6c5coXumA9M00Hg='"> <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/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit 8d1551239f1a6e76bc2801df54efeac503e8f998 Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 00:26:44 2019 +0200 Update to script in line --- templates/meta.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/meta.html b/templates/meta.html index a86eb82..ddbd810 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,6 +11,7 @@ <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="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> +<meta http-equiv="Content-Security-Policy" content="script-src 'sha256-FqLmSOREzRHwnNg/O6ZAfzLKaIPr6c5coXumA9M00Hg='"> <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/master] Update to script in line
by hiro＠torproject.org 05 Apr '19

05 Apr '19

commit 1ed2eadef7036169b82e5c520bda1af61aaaa484 Author: hiro <hiro(a)torproject.org> Date: Fri Apr 5 00:09:01 2019 +0200 Update to script in line --- templates/script-download.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/templates/script-download.html b/templates/script-download.html index 1583d28..ce605ea 100644 --- a/templates/script-download.html +++ b/templates/script-download.html @@ -1 +1,14 @@ -<script src="{{ '/static/js/download.js'|asseturl }}" ></script> +<script> + $(".downloadLink").click( + function(e) { + e.preventDefault(); + + //open download link in new page + window.open( $(this).attr("href") ); + + //redirect current page to success page + window.location="{{ '/thank-you'|url(alt=this.alt) }}"; + window.focus(); + } + ); +</script>

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 04 Apr '19

04 Apr '19

commit 77d11e264f9a7766e73b96cabf545221ad2cc66b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 4 21:50:47 2019 +0000 Update translations for support-portal --- contents+ca.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index fe3e9d432..dab7312f9 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1,7 +1,7 @@ # Translators: -# Marc Ripoll <markripesp(a)gmail.com>, 2019 # erinm, 2019 # Emma Peel, 2019 +# Marc Ripoll <markripesp(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-03-29 11:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Marc Ripoll <markripesp(a)gmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -139,6 +139,9 @@ msgid "" "Browser](https://www.torproject.org/download/) and then using it to navigate" " to the blocked site will allow access." msgstr "" +"Normalment, descarregar el [Navegador " +"Tor](https://www.torproject.org/download/) i utilitzar-lo per navegar per la" +" pàgina bloquejada permetrà accedir-la." #: https//support.torproject.org/faq/faq-2/ #: (content/faq/faq-2/contents+en.lrquestion.description)

1 0

[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 04 Apr '19

04 Apr '19

commit 453afdc3e0a8c56b4ab1ae52a4b69bc6188532b7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 4 21:19:50 2019 +0000 Update translations for torbutton-browseronboardingproperties_completed --- he/browserOnboarding.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he/browserOnboarding.properties b/he/browserOnboarding.properties index 5555d313c..3123f2120 100644 --- a/he/browserOnboarding.properties +++ b/he/browserOnboarding.properties @@ -43,7 +43,7 @@ onboarding.tour-tor-onion-services.next-button=בוצע onboarding.overlay-icon-tooltip-updated2=ראה מה חדש\nב־%S onboarding.tour-tor-update.prefix-new=חדש -onboarding.tour-tor-update.prefix-updated=Updated +onboarding.tour-tor-update.prefix-updated=מעודכן onboarding.tour-tor-toolbar=סרגל כלים onboarding.tour-tor-toolbar-update-8.5.title=פריסת סרגל כלים @@ -51,7 +51,7 @@ onboarding.tour-tor-toolbar-update-8.5.description=שיפרנו את פריסת onboarding.tour-tor-toolbar-update-8.5.next-button=לך אל אבטחה onboarding.tour-tor-security-update-8.5.title=חוויה של רמת אבטחה -onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. +onboarding.tour-tor-security-update-8.5.description=שיפרנו את הדרך שבה אתה רואה ומגדיר את רמת האבטחה שלך. החלפנו את מחוון האבטחה בצלמית סרגל כלים שהופכת את הרמה הנוכחית שלך לגלויה כל הזמן. לחץ עליה כדי לראות פרטים אודות הרמה הנוכחית שלך או כדי לשנות את הגדרות האבטחה שלך. # Circuit Display onboarding. onboarding.tor-circuit-display.next=הבא

1 0