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

[community/staging] We want to link to training resources in the training repo
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 01dc04ef3917ef242f2a3a7626e7dc8d157fabba Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Oct 31 14:36:32 2019 +0100 We want to link to training resources in the training repo --- databags/training-resources.json | 11 +++++++++++ templates/resources.html | 21 +++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/databags/training-resources.json b/databags/training-resources.json new file mode 100644 index 0000000..b1fecd7 --- /dev/null +++ b/databags/training-resources.json @@ -0,0 +1,11 @@ +{ + "all-about-tor" : + { + "label" : "All About Tor", + "name" : "all-about-tor", + "filename" : "all-about-tor-full-pack", + "formats" : ["odp","md"], + "description" : "Full set of slides for Tor Trainings", + "date" : "2019" + } +} \ No newline at end of file diff --git a/templates/resources.html b/templates/resources.html index d40c313..1ee86d9 100644 --- a/templates/resources.html +++ b/templates/resources.html @@ -14,16 +14,21 @@ </tr> </thead> <tbody> - {% from "macros/resources.html" import render_resource %} - {% for item in this.attachments %} - {{ render_resource(item) }} - {% endfor %} + {% for id, item in bag('training-resources').items() %} + <tr> + <td>{{ item.label}}</td> + <td>{{ item.description }}</td> + <td> + {% for format in item.formats %} + <a href="https://gitweb.torproject.org/community/training.git/plain/{{ item.date }}/{{ item.name }}/{{ item.filename }}.{{format}}">{{ format }}</a> + {% endfor %} + </td> + <td>{{ item.date }}</td> + </tr> + {% endfor %} </tbody> </table> </div> </div> </div> -</div> - - - +</div> \ No newline at end of file

1 0

[community/staging] update content
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 66520000dc35ef9451ffcccfa45a9f5662bfdde4 Author: Antonela <hola(a)antonela.me> Date: Mon Oct 21 13:40:23 2019 -0300 update content --- content/user-research/become-tester/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 46b41fb..de0ef97 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -4,7 +4,7 @@ section_id: user-research --- title: Become a Tester --- -subtitle: We regularly release Tor Browser Alpha versions to allow users to test software improvements and new ideas. [Sign up to be in our testing pool](https://survey.torproject.org/alpha-tester). +subtitle: We regularly release Tor Browser early versions to allow users to test software improvements and new ideas. Sign up to be in our testing pool. --- key: 1 ---

1 0

[community/staging] Update user-research section to include hidden content
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit c7309bc6e56a51d5e648fc7990671b2d589de1e6 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 17:37:44 2019 +0200 Update user-research section to include hidden content --- content/user-research/become-tester/contents.lr | 4 +--- content/user-research/contents.lr | 2 ++ content/user-research/guidelines/contents.lr | 4 +--- content/user-research/open/contents.lr | 4 ++-- lego | 2 +- templates/two-columns-page.html | 2 +- templates/user-research.html | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 7025245..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,8 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -_template: layout.html ---- -html: two-columns-page.html +_hidden: yes --- body: diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..e6fb45d 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -21,3 +21,5 @@ body: ## We respect our users' privacy when we conduct research. We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. +--- +_discoverable: yes diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index a036343..0958fe9 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,12 +8,10 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -hide: yes +_hidden: yes --- key: 3 --- -html: two-columns-page.html ---- body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index c1f5c1a..252fbea 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,9 +12,9 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -key: 2 +_hidden: yes --- -html: two-columns-page.html +key: 2 --- body: These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). diff --git a/lego b/lego index 09c5813..a2e8d34 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8 diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 5151905..3c6832b 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -6,7 +6,7 @@ <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in this.children.include_hidden(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> diff --git a/templates/user-research.html b/templates/user-research.html index e12fa62..7d6bd13 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,13 @@ </div> </div> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {{ _(child.title) }} </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/staging] update content status
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 1e624ba4452939bf3b78fdba217e60b51d0d5949 Author: Antonela <hola(a)antonela.me> Date: Mon Oct 21 13:02:33 2019 -0300 update content status --- content/user-research/become-tester/contents.lr | 2 +- content/user-research/guidelines/contents.lr | 2 +- content/user-research/open/contents.lr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 46b41fb..9540db2 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -_hidden: yes +discoverable: no --- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 0958fe9..d6256ca 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,7 +8,7 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -_hidden: yes +_discoverable: yes --- key: 3 --- diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index 252fbea..5aacad2 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,7 +12,7 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -_hidden: yes +_discoverable: yes --- key: 2 ---

1 0

[community/staging] Find and replace all links to "How to report bugs or feedback"
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 341445db0f6a8ae8b6517bab285ce2a9fd99d0d4 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:24:56 2019 +0530 Find and replace all links to "How to report bugs or feedback" Fixes part of https://dip.torproject.org/web/support/issues/39 --- content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 6194625..56eb26d 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -19,6 +19,6 @@ body: ### Reporting an error with a translation * If you are already a [Tor translator](becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). -* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://trac.torproject.org/projects/tor/wiki/doc/community/How…, under the **Community/Translations** component. +* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Translations** component. * You can report such issues on [irc](https://webchat.oftc.net/), on the #tor-l10n channel (you may need to be registered to log in). * You can send an email to the [tor localization mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n).

1 0

[community/staging] Ops! Small typo
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4bffa9619e6e50badc26e9659c59b00649ef724d Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Sep 5 17:30:39 2019 -0400 Ops! Small typo --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index 86c1638..241a967 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -1,6 +1,6 @@ _model: page --- -title: BSD* +title: *BSD --- color: primary ---

1 0

[community/staging] Update symlinks and add metatag
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 24dc3300438f52ef9659860b956b796598b70555 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 16:40:58 2019 +0200 Update symlinks and add metatag --- assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/js | 2 +- lego | 2 +- templates/meta.html | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/assets/javascript b/assets/javascript index c8db05e..f1da3c5 120000 --- a/assets/javascript +++ b/assets/javascript @@ -1 +1 @@ -../lego/assests/javascript \ No newline at end of file +../lego/assets/javascript \ No newline at end of file diff --git a/assets/scss b/assets/scss index b77f409..2d8ed2e 120000 --- a/assets/scss +++ b/assets/scss @@ -1 +1 @@ -../lego/assests/scss \ No newline at end of file +../lego/assets/scss \ No newline at end of file diff --git a/assets/static/css b/assets/static/css index 0db4948..12e4567 120000 --- a/assets/static/css +++ b/assets/static/css @@ -1 +1 @@ -../../lego/assests/static/css \ No newline at end of file +../../lego/assets/static/css \ No newline at end of file diff --git a/assets/static/fonts b/assets/static/fonts index 2da38c7..25deee7 120000 --- a/assets/static/fonts +++ b/assets/static/fonts @@ -1 +1 @@ -../../lego/assests/static/fonts \ No newline at end of file +../../lego/assets/static/fonts \ No newline at end of file diff --git a/assets/static/js b/assets/static/js index 7b741e3..361859a 120000 --- a/assets/static/js +++ b/assets/static/js @@ -1 +1 @@ -../../lego/assests/static/js \ No newline at end of file +../../lego/assets/static/js \ No newline at end of file diff --git a/lego b/lego index 4911d14..3d80025 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8 +Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 diff --git a/templates/meta.html b/templates/meta.html index a4ae472..bcda0da 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,5 +1,6 @@ <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 }}"> <link rel="stylesheet" href="{{ '/static/css/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

[community/staging] Add code of conduct from remote repository
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit fb39e68719548fb7a3345a85958e969988152478 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:59:17 2019 +0200 Add code of conduct from remote repository --- content/training/code-of-conduct/contents.lr | 2 +- lego | 2 +- templates/two-columns-page.html | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/content/training/code-of-conduct/contents.lr b/content/training/code-of-conduct/contents.lr index 0f3eab0..6d39f0d 100644 --- a/content/training/code-of-conduct/contents.lr +++ b/content/training/code-of-conduct/contents.lr @@ -20,6 +20,6 @@ html: two-columns-page.html --- body: -##Code of Conduct for Trainers +## Code of Conduct for Trainers The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. You can find our code of conduct [here](https://gitweb.torproject.org/community/policies.git/tree/code_of_con… diff --git a/lego b/lego index 62b25f1..4911d14 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 62b25f1cba4a7af931ccd8f4420d0669812db09c +Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8 diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 4ccb30e..199a452 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -14,6 +14,11 @@ </div> {% endfor %} </div> + + {% if this.path == "/training/code-of-conduct" %} + {{ render_text("https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.…")|safe }} + {% endif %} + <div class="card mt-5"> <ul class="list-group list-group-flush">  @@ -23,4 +28,4 @@ </ul> </div> </div> -</div> \ No newline at end of file +</div>

1 0

[community/staging] typo.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit bcc60b133cc2b06259261e061eb1b116a00463b6 Merge: ee0a98f 4bffa96 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:32:06 2019 +0200 typo. closes https://github.com/torproject/community/pull/10 .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/staging] Update trademark FAQ link in footer
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 07d01f82cd4e1b8f5e00611f3de068262282d174 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sun Sep 8 07:36:43 2019 +0530 Update trademark FAQ link in footer will-fix https://dip.torproject.org/web/tpo/issues/39 partly --- templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/footer.html b/templates/macros/footer.html index 90b9dfd..e3c90c8 100644 --- a/templates/macros/footer.html +++ b/templates/macros/footer.html @@ -1,3 +1,3 @@ {% macro render_faq() %} - <a href="https://www.torproject.org/docs/trademark-faq" target="_blank" class="text-primary text-light"><u>FAQ</u></a> + <a href="https://www.torproject.org/about/trademark/" target="_blank" class="text-primary text-light"><u>FAQ</u></a> {% endmacro %}

1 0