- tor-commits - lists.torproject.org

[tpo/develop] Merge remote-tracking branch 'galadran/add-djackson'
by gus＠torproject.org 22 May '20

22 May '20

commit 6defd32554fedd5d2818e8f43c060e59eed455e0 Merge: c10218e2 f0d0e1dc Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 10 10:11:07 2020 +0200 Merge remote-tracking branch 'galadran/add-djackson' assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/keys/dennisjackson.txt | 52 ++++++++++++++++++++++++++ content/about/people/djackson/contents.lr | 21 +++++++++++ 3 files changed, 73 insertions(+)

1 0

[tpo/develop] In People page: replaces mastodon_handle with mastodon_url
by gus＠torproject.org 22 May '20

22 May '20

commit d4f56896df14de44a358228b5ae734a648d95a0a Author: Jim Newsome <jnewsome(a)torproject.org> Date: Tue Apr 28 13:45:37 2020 -0500 In People page: replaces mastodon_handle with mastodon_url mastodon_handle assumed a hard-coded mastodon instance of mastodon.social. mastodon_url instead takes the full URL, which includes both the instance and the handle. --- content/about/people/jnewsome/contents.lr | 2 +- content/about/people/meejah/contents.lr | 2 +- models/person.ini | 4 ++-- templates/macros/people.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/about/people/jnewsome/contents.lr b/content/about/people/jnewsome/contents.lr index 416c7eb2..68f029c6 100644 --- a/content/about/people/jnewsome/contents.lr +++ b/content/about/people/jnewsome/contents.lr @@ -10,7 +10,7 @@ pronoun: he --- nickname: jnewsome --- -mastodon: sporksmith(a)mastodon.social +mastodon_url: https://mastodon.social/@sporksmith --- twitter_handle: sporksmith --- diff --git a/content/about/people/meejah/contents.lr b/content/about/people/meejah/contents.lr index ade11754..6e8f4fcf 100644 --- a/content/about/people/meejah/contents.lr +++ b/content/about/people/meejah/contents.lr @@ -14,7 +14,7 @@ gpg: https://meejah.ca/meejah.asc --- image: /static/images/people/meejah.png --- -mastodon_handle: meejah +mastodon_url: https://mastodon.social/@meejah --- description: diff --git a/models/person.ini b/models/person.ini index b4868da1..a3e4bf84 100644 --- a/models/person.ini +++ b/models/person.ini @@ -12,8 +12,8 @@ label = Twitter Handle type = string addon_label = @ -[fields.mastodon_handle] -label = Mastodon Handle +[fields.mastodon_url] +label = Mastodon URL type = string addon_label = @ diff --git a/templates/macros/people.html b/templates/macros/people.html index 779d171a..7c35c6f9 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -25,8 +25,8 @@ {% if item.twitter_handle %} <a class="float-right py-4 px-2" href="https://twitter.com/{{ item.twitter_handle }}"><i class="fab fa-twitter-png-purple"></i></a> {% endif %} - {% if item.mastodon_handle %} - <a class="float-right py-4 px-2" href="https://mastodon.social/@{{ item.mastodon_handle }}"><i class="fab fa-mastodon-png-purple"></i></a> + {% if item.mastodon_url %} + <a class="float-right py-4 px-2" href="{{ item.mastodon_url }}"><i class="fab fa-mastodon-png-purple"></i></a> {% endif %} {% if item.gpg %} {% set link = site.get(item.gpg) %}

1 0

[tpo/develop] 0.4.3.4-rc is released.
by gus＠torproject.org 22 May '20

22 May '20

commit ace35d942a7f2a818abfe66be796d98a25c74f6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 13 16:48:12 2020 -0400 0.4.3.4-rc is released. --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index ed6a0ddb..89863399 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,5 +9,5 @@ version = 9.5a11 version = 0.4.2.7 [tor-alpha] -version = 0.4.3.3-alpha +version = 0.4.3.4-rc

1 0

[tpo/develop] Change open-iconic code to navbar-toggler-icon class
by gus＠torproject.org 22 May '20

22 May '20

commit 0405e7ebbd5d35a977bf9fac69840d0bfb907424 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 11 21:13:17 2020 +0000 Change open-iconic code to navbar-toggler-icon class --- templates/sidenav.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 8490aad2..48c8c60d 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -4,9 +4,8 @@ {{ _('Topics') }} </a> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="oi oi-chevron-top chevron-up"></span> - <span class="oi oi-chevron-bottom chevron-down"></span> + <a class="btn btn-lg outline-primary text-primary navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> </a> </label> <input type="checkbox" id="menu-toggle"/>

1 0

[tpo/develop] Add jnewsome's mastodon handle
by gus＠torproject.org 22 May '20

22 May '20

commit 9c75980403a512aa19623126dac9d1ec80dbc7a4 Author: Jim Newsome <jnewsome(a)torproject.org> Date: Tue Apr 28 17:06:18 2020 +0000 Add jnewsome's mastodon handle --- content/about/people/jnewsome/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/jnewsome/contents.lr b/content/about/people/jnewsome/contents.lr index 92bbd0fe..416c7eb2 100644 --- a/content/about/people/jnewsome/contents.lr +++ b/content/about/people/jnewsome/contents.lr @@ -10,6 +10,8 @@ pronoun: he --- nickname: jnewsome --- +mastodon: sporksmith(a)mastodon.social +--- twitter_handle: sporksmith --- gpg: /static/keys/jnewsome.txt

1 0

[tpo/develop] correct filename so sponsor appears.
by gus＠torproject.org 22 May '20

22 May '20

commit 67485645c2037f0c7b3a26033fb8cebb7a1d5c3b Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 10 11:10:21 2020 +0200 correct filename so sponsor appears. will-fix: https://gitlab.torproject.org/torproject/web/tpo/-/issues/66 --- content/about/sponsors/Zcash/{content.lr => contents.lr} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/content/about/sponsors/Zcash/content.lr b/content/about/sponsors/Zcash/contents.lr similarity index 100% rename from content/about/sponsors/Zcash/content.lr rename to content/about/sponsors/Zcash/contents.lr

1 0

[tpo/develop] Add id for #board - fix #47
by gus＠torproject.org 22 May '20

22 May '20

commit fc62d077f4f87222bce1ec344f2d349b0d94c60c Author: gus <gus(a)torproject.org> Date: Tue Apr 28 22:52:31 2020 -0400 Add id for #board - fix #47 --- templates/people.html | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/people.html b/templates/people.html index 1e0e4565..821a27b2 100644 --- a/templates/people.html +++ b/templates/people.html @@ -1,14 +1,16 @@ -<div class="container py-3"> - <a class="text-primary display-5" href="#board">{{ _('Board of Directors') }}</a> - <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a> -</div> -<div class="container-fluid"> - <div class="row"> - {% from "macros/people.html" import render_board %} - {% set items = site.query('/about/people').include_undiscoverable(true).filter(F.role == 'board') %} - {% for item in items %} - {{ render_board(item, this.alt) }} - {% endfor %} +<div id="board"> + <div class="container py-3"> + <a class="text-primary display-5" href="#board">{{ _('Board of Directors') }}</a> + <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a> + </div> + <div class="container-fluid"> + <div class="row"> + {% from "macros/people.html" import render_board %} + {% set items = site.query('/about/people').include_undiscoverable(true).filter(F.role == 'board') %} + {% for item in items %} + {{ render_board(item, this.alt) }} + {% endfor %} + </div> </div> </div> <div id="core" class="container py-3">

1 0

[tpo/develop] Merge branch 'generalize-mastodon'
by gus＠torproject.org 22 May '20

22 May '20

commit 0e9348ba98cc1d8e17a3f37c969be66339043cb1 Merge: 0405e7eb d4f56896 Author: gus <gus(a)torproject.org> Date: Fri May 1 14:48:03 2020 -0400 Merge branch 'generalize-mastodon' content/about/people/jnewsome/contents.lr | 2 +- content/about/people/meejah/contents.lr | 2 +- models/person.ini | 4 ++-- templates/macros/people.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tpo/develop] Update volunteer and relay guide links to community portal - Fix #70
by gus＠torproject.org 22 May '20

22 May '20

commit 27d985d40b9d06f633d1a8216c98dcf55bf6336b Author: gus <gus(a)torproject.org> Date: Tue Apr 28 23:44:56 2020 -0400 Update volunteer and relay guide links to community portal - Fix #70 --- templates/thank-you.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/thank-you.html b/templates/thank-you.html index 56d08356..0c9f8d3e 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -18,11 +18,11 @@ </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-cube-png"></i> - <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> + <h4><a href="https://community.torproject.org/relay">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-hands-helping-png"></i> - <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> + <h4><a href="https://community.torproject.org/">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div> </div>

1 0

[tpo/develop] Merge remote-tracking branch 'dip/core-contributors-update'
by gus＠torproject.org 22 May '20

22 May '20

commit 14c28f96689378ffe3bf60e1d88ecec398670751 Merge: 67485645 30e2ae48 Author: gus <gus(a)torproject.org> Date: Fri Apr 10 21:03:54 2020 -0400 Merge remote-tracking branch 'dip/core-contributors-update' assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/keys/dawuud.txt | 471 ----------------------------- assets/static/keys/jnewsome.txt | 52 ++++ assets/static/keys/juris.txt | 321 -------------------- assets/static/keys/nyinz.txt | 57 ---- assets/static/keys/t0mmy.txt | 51 ---- content/about/people/ailanthus/contents.lr | 19 -- content/about/people/dawuud/contents.lr | 20 -- content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 21 ++ content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/narrira/contents.lr | 17 ++ content/about/people/pepijn/contents.lr | 19 -- content/about/people/wayward/contents.lr | 19 -- 20 files changed, 94 insertions(+), 1022 deletions(-)

1 0