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

[donate-static/staging] Merge branch 'staging' of git-rw.torproject.org:project/web/donate-static into staging
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 14ccb84a244e2eaf975110749765f9939b57b1cb Merge: 5521d021 2398a5c8 Author: gus <gus(a)torproject.org> Date: Mon Jun 28 17:06:45 2021 -0300 Merge branch 'staging' of git-rw.torproject.org:project/web/donate-static into staging assets/static/gen/donate.js | 74 +++++++++-------- assets/static/gen/donate.js.map | 2 +- databags/donate.ini | 5 ++ parcel/js/base_url.js | 13 ++… [View More]

1 0

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

28 Jun '21

commit a8bf30da43b63bc90073c375c0c41175c88388e7 Author: kez <kez(a)torproject.org> Date: Tue Jun 22 14:34:40 2021 -0400 Move the remaining donate-pages to new layout template --- content/cryptocurrency/contents.lr | 5 +---- content/donate-thank-you/contents.lr | 4 +--- content/donor-faq/contents.lr | 4 +--- content/privacy-policy/contents.lr | 4 +--- content/state-disclosures/contents.lr | 4 +--- models/donate-page.ini | 4 ---- templates/donate-… [View More]empty.html | 3 ++- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr index d6403d1d..c49fd436 100644 --- a/content/cryptocurrency/contents.lr +++ b/content/cryptocurrency/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Cryptocurrency --- @@ -88,6 +88,3 @@ body: If you have any questions, or would like to donate a cryptocurrency not listed below, please email us at giving(a)torproject.org. </p> </div> - ---- -html: cryptocurrency.html diff --git a/content/donate-thank-you/contents.lr b/content/donate-thank-you/contents.lr index a2f2302f..74c7206c 100644 --- a/content/donate-thank-you/contents.lr +++ b/content/donate-thank-you/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Thank You --- @@ -36,5 +36,3 @@ We need people to run relays, write code, organize the community and spread the Learn how you can help. <hr> <a class="btn btn-primary" href="https://community.torproject.org/" target="_blank">I Want To Volunteer</a> ---- -html: donate-empty.html diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index ef5be450..ecdd955f 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- section_id: donate --- @@ -249,5 +249,3 @@ body: </div> </div> </div> ---- -html: donate-empty.html diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index 81b4db9a..ce626881 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- title: Donor Privacy Policy --- @@ -10,8 +10,6 @@ section: Donate --- color: primary --- -html: donate-empty.html ---- body: <div class="privacy-policy"> diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr index 77c08861..4085d0b3 100644 --- a/content/state-disclosures/contents.lr +++ b/content/state-disclosures/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: layout.html +_template: donate-empty.html --- section_id: donate --- @@ -38,5 +38,3 @@ body: </div> </div> </div> ---- -html: donate-empty.html diff --git a/models/donate-page.ini b/models/donate-page.ini index bd441c6e..577e3675 100644 --- a/models/donate-page.ini +++ b/models/donate-page.ini @@ -41,7 +41,3 @@ translate = True [fields.color] label = Color type = string - -[fields.html] -label = Html -type = string diff --git a/templates/donate-empty.html b/templates/donate-empty.html index ba2adc27..85d11b6a 100644 --- a/templates/donate-empty.html +++ b/templates/donate-empty.html @@ -1,4 +1,5 @@ -{% block body %} +{% extends "layout.html" %} +{% block content %} <div class="donate-page"> <div class="donate-page-wrapper {{ this.page_type }}"> {{ this.body }} [View Less]

1 0

[donate-static/staging] Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 3fc3ea26a065792644e8a443ce617e19817757fc Merge: 14ccb84a e11a0007 Author: gus <gus(a)torproject.org> Date: Mon Jun 28 17:07:57 2021 -0300 Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging content/champions-of-privacy/contents.lr | 4 +-- content/contents.lr | 4 +-- content/cryptocurrency/contents.lr | 5 +--- content/donate-thank-you/contents.lr | 4 +-- content/donor-faq/contents.lr | 4 +-- content/… [View More]

1 0

[manual/master] Update contents.lr
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit cef7a48381831b9c33f4c80ce3b4bdfa269d30ea Author: nyxnor <nyxnor(a)protonmail.com> Date: Sat Jun 26 22:27:15 2021 +0000 Update contents.lr --- content/mobile-tor/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index 1032a42..ec90b0b 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -189,7 +189,8 @@ At the moment, there are some features which … [View More]

1 0

[manual/master] Merge branch 'client-auth-mobile'
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit f92e5e565dbbc8d9c1447118c5b6a5994bc66bee Merge: bfc5679 cef7a48 Author: gus <gus(a)torproject.org> Date: Mon Jun 28 16:17:23 2021 -0300 Merge branch 'client-auth-mobile' content/mobile-tor/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[community/master] Update content/onion-services/advanced/https/contents.lr
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit da3a146c4eda016d9c3c7404ca22a7fd1e57a2de Author: nyxnor <nyxnor(a)protonmail.com> Date: Sat Jun 26 01:42:32 2021 +0000 Update content/onion-services/advanced/https/contents.lr --- content/onion-services/advanced/https/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/onion-services/advanced/https/contents.lr b/content/onion-services/advanced/https/contents.lr index 06caa42..8c0941d 100644 --- a/content/onion-services/advanced/https/… [View More]

1 0

[community/master] Update contents.lr
by gus＠torproject.org 28 Jun '21

28 Jun '21

commit 0f649b88da9bfeef48d912a0943d2bd0e329d50f Author: nyxnor <nyxnor(a)protonmail.com> Date: Fri Jun 25 21:16:38 2021 +0000 Update contents.lr --- content/onion-services/advanced/https/contents.lr | 1 + 1 file changed, 1 insertion(+) diff --git a/content/onion-services/advanced/https/contents.lr b/content/onion-services/advanced/https/contents.lr index b3166c8..06caa42 100644 --- a/content/onion-services/advanced/https/contents.lr +++ b/content/onion-services/advanced/https/… [View More]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Jun '21

28 Jun '21

commit c40433c1d5a2e88f7ebf80943b774fdf331a7a07 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 28 17:47:49 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 8b912298e1..1b0656e369 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9954,7 +9954,7 @@ msgstr "" #: https//support.torproject.org/… [View More]

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Jun '21

28 Jun '21

commit a77e414ce682f7bc095a03b0c967275389c9fc31 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 28 17:46:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ar.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index e1c3a26885..eced79cb85 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -1030,6 +1030,8 @@ msgid "" "fact that you are using Tor, … [View More]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 28 Jun '21

28 Jun '21

commit fcfdc7132cd62b2f18ac5cf335a9035a9fa04986 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 28 16:15:16 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fr.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 490978b7ef..f5672e265a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -15,6 +15,7 @@ # erinm, 2021 # Emma Peel, 2021 #… [View More]

1 0