October 2020 - tor-commits - lists.torproject.org

[donate-static/staging] Update content/contents.lr
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 6c6acaf8723e7859937b52d91e47ab6d65fd543c Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 11:53:54 2020 +0000 Update content/contents.lr --- content/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 6ab3c7d6..d8a4df70 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -50,11 +50,11 @@ sticker_perk_monthly_label: Sticker Pack --- sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_single_label: Hoddie +sweatshirt_perk_single_label: Hoodie --- sweatshirt_perk_monthly_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_monthly_label: Hoddie +sweatshirt_perk_monthly_label: Hoodie --- sweatshirt_perk_single_image: /static/images/donate/hoodie-use-tor.png ---

1 0

[donate-static/staging] Update assets/static/images/donate/hoodie-use-tor.png
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit ee3b84987076f9f2058609c5e5c147a84a72b398 Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 11:52:43 2020 +0000 Update assets/static/images/donate/hoodie-use-tor.png --- .../donate/{hoddie-use-tor.png => hoodie-use-tor.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/donate/hoddie-use-tor.png b/assets/static/images/donate/hoodie-use-tor.png similarity index 100% rename from assets/static/images/donate/hoddie-use-tor.png rename to assets/static/images/donate/hoodie-use-tor.png

1 0

[donate-static/staging] Bump lego
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit a347b5d319bdc506b6fe822adab2f3cdab74ac0d Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 15:03:32 2020 +0200 Bump lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index a1bf61f3..7d50bd30 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit a1bf61f36ccf730df140f684e3ea6970b6d6a9d8 +Subproject commit 7d50bd30a216d3137ebf2c1c18f5b47403f9a69a

1 0

[donate-static/staging] Merge remote-tracking branch 'gitlab/antonela-master-patch-60489'
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 74d8f232bffec5b1af514a6d7910aa745486b220 Merge: 6c6acaf8 ee3b8498 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 14:54:28 2020 +0200 Merge remote-tracking branch 'gitlab/antonela-master-patch-60489' .../donate/{hoddie-use-tor.png => hoodie-use-tor.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[donate-static/staging] Merge branch 'staging'
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 14bb13ed05b7b86d0e3296e18633ed15e895a350 Merge: a347b5d3 71e5f6e7 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 15:21:13 2020 +0200 Merge branch 'staging' assets/static/gen/donate.js | 4 +-- assets/static/gen/donate.js.map | 2 +- .../donate/champions-of-privacy-white-full.png | Bin 0 -> 228759 bytes .../images/donate/champions-of-privacy-white.png | Bin 228759 -> 26291 bytes .../donate/defenders-of-privacy-white-full.png | Bin 0 -> 214940 bytes .../images/donate/defenders-of-privacy-white.png | Bin 214940 -> 25205 bytes content/champions-of-privacy/contents.lr | 23 +++++++++++---- content/monthly-giving/contents.lr | 4 +-- content/privacy-policy/contents.lr | 26 +++++++++++++++++ databags/menu_footer.ini | 8 +++++- models/donate-form.ini | 5 ++++ parcel/js/giving_form.jsx | 32 ++++++++++++--------- parcel/js/price_buttons.jsx | 3 +- templates/donate-form.html | 1 + templates/footer.html | 6 ---- templates/meta.html | 2 +- templates/navbar-min.html | 5 +++- templates/navbar.html | 5 +++- 18 files changed, 91 insertions(+), 35 deletions(-)

1 0

[donate-static/staging] Merge branch 'staging'
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit a2bda959208229d35f4e8496909837050e12b589 Merge: 14bb13ed 2a8ddd1b Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 15:39:15 2020 +0200 Merge branch 'staging' templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[donate-static/staging] Update champions-of-privacy/contents.lr
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit dba09b73736331e0b90165bb11c92a4b91f9f01a Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 13:47:23 2020 +0000 Update champions-of-privacy/contents.lr --- content/champions-of-privacy/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index 5f9b925c..0408394c 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -6,6 +6,8 @@ _template: layout.html --- body: --- +color: primary +--- html: donate-form.html --- title: Champions of Privacy

1 0

[tor-browser-build/maint-10.0] Changelog fixups
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 34ee0c92ab6efbc34b15646d5e4e081be5a6c286 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 20 13:45:25 2020 +0000 Changelog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 8e7181b..99e54bb 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,10 +2,10 @@ Tor Browser 10.0.2 -- October 20 2020 * Windows + OS X + Linux * Update Firefox to 78.4.0esr * Update NoScript to 11.1.3 - * Bug 40192: Backport Mozilla Bug 1658881 + * Bug 40192: Backport Mozilla Bug 1658881 [tor-browser] * Translations update * Linux - * Bug 40193: Add `AT_EMPTY_PATH` definition + * Bug 40193: Add `AT_EMPTY_PATH` definition [tor-browser] Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux @@ -24,7 +24,7 @@ Tor Browser 10.0.1 -- October 13 2020 * Bump Go to 1.14.9 * Bump openssl to 1.1.1h * Windows - * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] + * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux @@ -76,7 +76,6 @@ Tor Browser 10.0 -- September 22 2020 * Bug 40006: Fix new identity for 81 [torbutton] * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] * Bug 40008: Style fixes for 78 [torbutton] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40022: Update new icons in Tor Browser branding [tor-browser] * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]

1 0

[donate-static/master] Merge branch 'staging'
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit a2bda959208229d35f4e8496909837050e12b589 Merge: 14bb13ed 2a8ddd1b Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 15:39:15 2020 +0200 Merge branch 'staging' templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[donate-static/master] Use navbar-min
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 2a8ddd1b0a2f276dddb0848c3ed29f0d264a9e05 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 15:38:59 2020 +0200 Use navbar-min --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 478f22db..17a9652f 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,5 +20,5 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% include 'navbar.html' %} + {% include 'navbar-min.html' %} </header>

1 0