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

[tpo/staging] add #tor-ux channel
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 40bc43a2fc10df9129ff7ab0446cd11e913aa836 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Thu Sep 5 20:10:23 2019 +0530 add #tor-ux channel Fixes https://dip.torproject.org/web/tpo/issues/36 --- templates/contact.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/contact.html b/templates/contact.html index b519fc1..dec2d49 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -10,10 +10,11 @@ <p class="text-tpo"><span class="text-primary nick">#tor-dev</span> - {{ _("Discuss Tor-related coding and protocols. Ideas are welcome.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-l10n</span> - {{ _("Get in touch with other translators") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-meeting</span> - {{ _("Watch or join publicly logged team meetings.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, and translation.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-relays</span> - {{ _("Discuss running a Tor relay.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor's global south community.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-www</span> - {{ _("Talk with us about our portals.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-www</span> - {{ _("Talk with us about improvements on our websites.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-ux</span> - {{ _("Discuss UX related ideas.") }}</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div>

1 0

[tpo/staging] Add README.md with contrib, how to build lektor, bug report instructions
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit c59be60026bfaa1ac7bea73b62030006d5901390 Author: Antonela <hola(a)antonela.me> Date: Thu Sep 5 21:08:05 2019 -0400 Add README.md with contrib, how to build lektor, bug report instructions close https://dip.torproject.org/web/tpo/issues/38 --- README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 0000000..6a3d132 --- /dev/null +++ b/README.md @@ -0,0 +1,63 @@ +# Tor Project Website + +This is the repository of Tor Project website. The current online version of this portal can be found at [https://torproject.org](https://torproject.org) or [Tor Project Onion Service](http://expyuzz4wqqyqhjn.onion/). + +To clone the code use either of + +```git clone https://git.torproject.org/project/web/tpo.git/``` + +```torify git clone http://dccbbv6cooddgcrq.onion/project/web/tpo.git/``` + +or browse it [online](http://gitweb.torproject.org/project/web/tpo.git). + +## How to report bugs or feedback + +First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/tpo/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Website. + + +## What is Lektor + +[Lektor](https://www.getlektor.com/) is a framework to generate and serve websites from Markdown files. + +Its code can be found at [GitHub](https://github.com/lektor/lektor). + +## How to contribute + +### (Easy) Edit this page button + +You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/community/pulls). + +### (Advanced) Compiling a local version of the website + +1. Download and install Lektor: https://www.getlektor.com/downloads/ + +2. Install the lektor-i18n plugin and its [dependencies](https://github.com/numericube/lektor-i18n-plugin#prerequisite…. + +3. Clone the repository: + +```git clone https://git.torproject.org/project/web/tpo.git``` + +4. Init the building blocks submodule: + +```$ cd lego && git submodule update --init --recursive``` + +5. Translations for the website are imported by Jenkins when bulding the page, but if you want to test them, download the correct branch of the translations repo to the ./i18n/ folder. + +6. Finally + +To run a local continuous builder: ```$ lektor server``` + +To just build the website once: ```$ lektor build -O <folder>``` + +#### How to develop on the website + +Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the…. + +### Translations + +To help us to translate, please join the Tor Project team in [Transifex](https://www.transifex.com/). + + +### Getting help + +If you want to contribute to the Tor Project website, we will be happy to help you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net).

1 0

[tpo/staging] Add links to download Tor Browser for Android
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 2da1ff9871a74767905b60eb411112ba5b069d53 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Fri Sep 6 11:42:19 2019 -0400 Add links to download Tor Browser for Android --- databags/download-tb-for-android-alpha.ini | 14 ++++++++++++++ templates/download-options.html | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/databags/download-tb-for-android-alpha.ini b/databags/download-tb-for-android-alpha.ini new file mode 100644 index 0000000..5006897 --- /dev/null +++ b/databags/download-tb-for-android-alpha.ini @@ -0,0 +1,14 @@ +[Google Play] +url = https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp… + +[arch64] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… + +[arm] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… + +[x86] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… diff --git a/templates/download-options.html b/templates/download-options.html index 8698e73..c515669 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -36,4 +36,22 @@ </tbody> </table> </div> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th>Tor Browser for Android Alpha</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('download-tb-for-android-alpha').items() %} + <tr> + <td> + <a href="{{ item.url }}">{{ id }}</a>{% if item.sig %} (<a href="{{ item.sig }}">sig</a>){% endif %} + </td> + </tr> + {% endfor %} + </tbody> + </table> + </div> </div>

1 0

[tpo/staging] Update my gpg key to db.tpo and role
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit b7d0cfa29ed87e7d20a46d44be5515507926a570 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Fri Sep 6 04:31:31 2019 -0400 Update my gpg key to db.tpo and role --- content/about/people/ggus/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/people/ggus/contents.lr b/content/about/people/ggus/contents.lr index a8e9ac5..b1dce82 100644 --- a/content/about/people/ggus/contents.lr +++ b/content/about/people/ggus/contents.lr @@ -8,8 +8,8 @@ name: Gustavo Gus --- nickname: ggus --- -gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0x8BDC87FB7215E189 +gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=427F2D717664D215378CB412… --- description: -Works as Community Liaison in Global South. Trainer, relay operator and Tor advocate. CryptoRave organizer. +Works as Community Team Lead. Trainer, relay operator and Tor advocate. CryptoRave organizer.

1 0

[tpo/staging] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit d83f7beb07eece2cbd221abd92dae295e7b15de8 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:33:49 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/download/alpha/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/download/alpha/contents.lr b/content/download/alpha/contents.lr index 7f490e2..415cbef 100644 --- a/content/download/alpha/contents.lr +++ b/content/download/alpha/contents.lr @@ -13,4 +13,4 @@ title: Download Tor Browser Alpha body: Before we release a stable version of our software, we release an alpha version to test features and find bugs. -Please only download an alpha if you are okay with some things not working properly, want to help us find and [report bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…, and are not putting yourself at risk. +Please only download an alpha if you are okay with some things not working properly, want to help us find and [report bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not putting yourself at risk.

1 0

[tpo/staging] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit cce3a1c4e978c767ed1d5ce90876a89815beb758 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:50:18 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 --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index bd87b90..7860217 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -60,7 +60,7 @@ <div class="oval-3 mt-3 p-2"><i class="text-primary fas fa-spider-png"></i></div> </div> <div class="row mt-3 mr-5"> - <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…" target="_blank">{{ _('Report a bug or give feedback.') }}</a> + <a class="h4 text-primary" href="https://support.torproject.org/misc/bug-or-feedback/" target="_blank">{{ _('Report a bug or give feedback.') }}</a> <p class="text-tpo">{{ _('Tor relies on the support of users and volunteers around the world to help us improve our software and resources, so your feedback is extremely valuable to us (and to all Tor users).') }}</p> </div> <div class="row">

1 0

[tpo/staging] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 0dc1c2c7aaf8c7a62f6112e087646509305c1339 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:35:53 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 --- templates/macros/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/question.html b/templates/macros/question.html index 1b5fa59..4de15ac 100644 --- a/templates/macros/question.html +++ b/templates/macros/question.html @@ -12,7 +12,7 @@  <li class="list-group-item"> <a href="https://github.com/torproject/tpo/edit/master/content{{ item.path }}/contents.lr">{{ _("Edit this page") }}</a> - - <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…">{{ _("Suggest Feedback") }}</a> - + <a href="https://support.torproject.org/misc/bug-or-feedback/">{{ _("Suggest Feedback") }}</a> - <a href="#{{ item._id }}" data-target="#{{ item._id }}">{{ _("Permalink") }}</a> </li> </ul>

1 0

[tpo/staging] Remove 9.0a4 from RecommendedTBBVersions
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit cd423757b8adcf16ad55b7e1231bad64e7a75278 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Sep 7 12:27:24 2019 +0200 Remove 9.0a4 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index b07f01a..7b28d2b 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,10 +9,6 @@ body: "8.5.5-MacOS", "8.5.5-Linux", "8.5.5-Windows", -"9.0a4", -"9.0a4-MacOS", -"9.0a4-Linux", -"9.0a4-Windows", "9.0a6", "9.0a6-MacOS", "9.0a6-Linux",

1 0

[tpo/staging] Merge remote-tracking branch 'rotmatrix/fix-34-android-alpha-downloads'
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 4bdc8bbc052a2d5e8ab89e9fcc800048122004ef Merge: b23afc4 7d80531 Author: hiro <hiro(a)torproject.org> Date: Wed Sep 11 12:38:28 2019 +0200 Merge remote-tracking branch 'rotmatrix/fix-34-android-alpha-downloads' Add links to download Tor Browser for Android Alpha templates/download-options.html | 32 ++++++++++++++++++++++++++++++++ templates/macros/downloads.html | 7 +++++++ 2 files changed, 39 insertions(+)

1 0

[tpo/staging] Fix typo "Steate" to "State of MA"
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 9e8bd6e134899443baf61d5c7101950dacc2bc18 Merge: 0c73159 d585f84 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 13:10:36 2019 +0200 Fix typo "Steate" to "State of MA" content/about/reports/2013-form-pc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0