June 2021 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-78.11.0esr-10.5-1] Adding issue template for bugs.
by sysrqb＠torproject.org 28 Jun '21

28 Jun '21

commit 9caf8dd94d1f2437abdb0e96be0310a5489e5eb7 Author: Gaba <gaba(a)torproject.org> Date: Mon Jun 28 11:44:16 2021 -0700 Adding issue template for bugs. --- .gitlab/issue_templates/UXBug.md | 29 +++++++++++++++++++++++++++++ .gitlab/issue_templates/bug.md | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/.gitlab/issue_templates/UXBug.md b/.gitlab/issue_templates/UXBug.md new file mode 100644 index 000000000000..8e7cb2a5e163 --- /dev/null +++ b/.gitlab/issue_templates/UXBug.md @@ -0,0 +1,29 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +## Relevant logs and/or screenshots +**Do you have screenshots? Attach them to this ticket please.** + +/label ~tor-ux ~needs-investigation ~bug +/assign @nah diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md new file mode 100644 index 000000000000..6ce85a4864be --- /dev/null +++ b/.gitlab/issue_templates/bug.md @@ -0,0 +1,32 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +### Environment +**Which operating system are you using? For example: Debian GNU/Linux 10.1, Windows 10, Ubuntu Xenial, FreeBSD 12.2, etc.** +**Which installation method did you use? Distribution package (apt, pkg, homebrew), from source tarball, from Git, etc.** + +### Relevant logs and/or screenshots + + +/label ~bug

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40484' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 28 Jun '21

28 Jun '21

commit 533b3100e72d75b8390abe58cd40387192bdb6e1 Merge: c9f997476bba 74739bc2ccf1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 28 20:06:49 2021 +0000 Merge remote-tracking branch 'richardgl/40484' into tor-browser-78.11.0esr-10.5-1 browser/components/torconnect/content/aboutTorConnect.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 28 Jun '21

28 Jun '21

commit 74739bc2ccf1bb99900ab1b3288aa99c7ef68727 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jun 25 12:03:52 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torconnect/content/aboutTorConnect.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 1c574a5d07c9..11301fa10cab 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -184,10 +184,10 @@ class AboutTorConnect { } async connect() { - // reset the text to original quickstart description + // reset the text to original description // in case we are trying again after an error (clears out error text) this.elemProgressDesc.textContent = - this.torStrings.settings.quickstartDescription; + this.torStrings.settings.torPreferencesDescription; this.state = AboutTorConnect.STATE_BOOTSTRAPPING; const error = await RPMSendQuery("TorConnect");

1 0

[donate-static/staging] Add Dogecoin wallet address. Fix #23
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 6bc0d7b70b6afb1479fdca93f38f1e648b32c822 Author: gus <gus(a)torproject.org> Date: Mon Mar 15 16:41:35 2021 -0300 Add Dogecoin wallet address. Fix #23 --- templates/cryptocurrency.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html index 00d96c56..4ce90318 100644 --- a/templates/cryptocurrency.html +++ b/templates/cryptocurrency.html @@ -85,6 +85,11 @@ 'id': 'XvF8mUwzKummA72GnkFojyeBuGByaG26mB', 'name': 'Dash', }, + { + 'symbol': 'DOGE', + 'id': 'DJwRnafcjDbzqWM5vsCphuyQuTc2QB3a8F', + 'name': 'Dogecoin', + }, { 'symbol': 'ETH', 'id': '0x532Fb5D00f40ced99B16d1E295C77Cda2Eb1BB4F',

1 0

[donate-static/staging] Fix footer links 404'ing from relative path
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 5521d021d5530894d6a87af01e460ac42994aaf7 Author: kez <kez(a)torproject.org> Date: Thu Jun 17 14:22:11 2021 -0400 Fix footer links 404'ing from relative path --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index 97d1488e..a8b7d54e 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -42,7 +42,7 @@ <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> + <a class="nav-link text-light" href="/{{ item.path|url(alt=this.alt) }}"> {% else %} {% set local = bag('links', this.alt, id) %} {% if local %}

1 0

[donate-static/staging] Create new layout.html template
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 796bca69392e5b0821d8cae892dce531412f3359 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:06:37 2021 -0400 Create new layout.html template --- templates/layout.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/layout.html b/templates/layout.html index f83df290..b0163d4e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,16 +1,14 @@ {% include 'meta.html' %} +<body> <div class="page pt-4"> {% include 'header.html' %} <div class="container-fluid"> <div class="row flex-xl-nowrap"> {% set locale = bag('alternatives', this.alt) %} <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> - {% if this.section_id != 'donate' %} - <div class="container py-3 mt-5 content"> - {{ this.body }} - </div> - {% endif %} - {% include this.html %} + {% if this.section_id != 'donate' %}<div class="container py-3 mt-5 content">{% endif %} + {% block content %}{% endblock %} + {% if this.section_id != 'donate' %}</div>{% endif %} </main> </div> </div>

1 0

[donate-static/staging] Make meta.html self-contained, add block for head
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 495561fb02bd5e5bb3045452948617d54ccd5264 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:03:48 2021 -0400 Make meta.html self-contained, add block for head --- templates/homepage.html | 1 + templates/meta.html | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 4eb22bec..551e668b 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,4 +1,5 @@ {% include 'meta.html' %} +<body> <div class="page"> <div class="container-fluid bg-dark"> <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> diff --git a/templates/meta.html b/templates/meta.html index 9f121524..321462e9 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,24 +1,23 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% 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.') }} | {{ this.title }}"> -<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="https://donate.torproject.org/static/images/donate/social-media-card.png"/> -<meta property="og:url" content="https://donate.torproject.org/" /> -<meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> -<meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> -<meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> -<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> - -<link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> - -<link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> -<body class="no-gutters"> - <header> - {% include 'navbar-min.html' %} - </header> +<head> + <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.') }} | {{ this.title }}"> + <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="https://donate.torproject.org/static/images/donate/social-media-card.png"/> + <meta property="og:url" content="https://donate.torproject.org/" /> + <meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> + <meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> + <meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> + <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> +  + <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> +  + <link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> + <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> + {% block head %}{% endblock %} +</head>

1 0

[donate-static/staging] Make donate-form.html extend the new layout template
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit e5ecad9b65268c2ee6c1beb0f779e2f36cc8ea47 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:07:01 2021 -0400 Make donate-form.html extend the new layout template --- templates/donate-form.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/donate-form.html b/templates/donate-form.html index f40052cb..e2f8bd67 100644 --- a/templates/donate-form.html +++ b/templates/donate-form.html @@ -1,3 +1,5 @@ +{% extends "layout.html" %} +{% block content %} <div> {{ this.intro }} </div> @@ -197,3 +199,4 @@ } </script> <script type="text/javascript" src="{{ '/static/gen/donate.js' | asseturl }}"></script> +{% endblock %}

1 0

[donate-static/staging] Move the donate-form pages to the new layout template
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 05015fd1f26cc4e116cc30fbbf0df44dd3c6c2bf Author: kez <kez(a)torproject.org> Date: Tue Jun 22 10:07:32 2021 -0400 Move the donate-form pages to the new layout template --- content/champions-of-privacy/contents.lr | 4 +--- content/contents.lr | 4 +--- content/monthly-giving/contents.lr | 4 +--- models/donate-form.ini | 6 +----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index bfa80c66..254bc59b 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -2,14 +2,12 @@ _model: donate-form --- frequency: single --- -_template: layout.html +_template: donate-form.html --- body: --- color: primary --- -html: donate-form.html ---- title: Champions of Privacy --- intro: diff --git a/content/contents.lr b/content/contents.lr index ff463405..27fbefc5 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -10,9 +10,7 @@ section_id: donate --- title: Donate --- -_template: layout.html ---- -html: donate-form.html +_template: donate-form.html --- intro: diff --git a/content/monthly-giving/contents.lr b/content/monthly-giving/contents.lr index 2f6eb7da..93bc3d37 100644 --- a/content/monthly-giving/contents.lr +++ b/content/monthly-giving/contents.lr @@ -10,9 +10,7 @@ section_id: donate --- title: Defenders of Privacy --- -_template: layout.html ---- -html: donate-form.html +_template: donate-form.html --- intro: diff --git a/models/donate-form.ini b/models/donate-form.ini index 6666207c..66e1beed 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -223,8 +223,4 @@ type = html [fields.total_matched_counter_label] label = Total Matched Counter Label -type = html - -[fields.html] -label = Html -type = string +type = html \ No newline at end of file

1 0

[donate-static/staging] Move the final template to the new layout, remove legacy layout
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit e11a0007c0d88324ce6656b85ae1e326d1ba36c1 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 16:18:53 2021 -0400 Move the final template to the new layout, remove legacy layout --- templates/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/page.html b/templates/page.html index 04305772..aa7a2cec 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% block title %}{{ this.title }}{% endblock %} -{% block body %} +{% block content %} <h2>{{ this.title }}</h2> {{ this.body }} {% endblock %}

1 0