tor-commits January 2019

tor-commits@lists.torproject.org

15 participants
2081 discussions

[tpo/master] i18n templates
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 0e63f3fc637fabbc4bde62772f01a9d659c70d0c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 15:04:20 2019 +0100 i18n templates --- templates/hero-home.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hero-home.html b/templates/hero-home.html index 666433d..a614779 100644 --- a/templates/hero-home.html +++ b/templates/hero-home.html @@ -1,11 +1,11 @@ <div class="row"> - <h1 class="mx-auto display-2 text-white">Browse Privately.</h1> + <h1 class="mx-auto display-2 text-white">{{ _('Browse Privately.') }}</h1> </div> <div class="row"> - <h1 class="mx-auto display-2 text-white">Explore Freely.</h1> + <h1 class="mx-auto display-2 text-white">{{ _('Explore Freely.') }}</h1> </div> <div class="row"> - <h1 class="mx-auto defend text-white">Defend yourself against tracking and surveillance. Circumnvent censorship.</h1> + <h1 class="mx-auto defend text-white">{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}</h1> </div> <div class="row col-12 p-5 mx-auto justify-content-center"> {% set download = site.get('/download') %}

1 0

[tpo/master] i18n templates
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 7a2208ecdbc429188478895fb48fe72d9e540216 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 15:17:49 2019 +0100 i18n templates --- templates/jobs.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/jobs.html b/templates/jobs.html index fece3cd..d1b98be 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -1,5 +1,5 @@ <div class="container py-3"> - <h3 class="text-primary display-5">Current Openings</h3> + <h3 class="text-primary display-5">{{ _('Current Openings') }}</h3> </div> <div class="container py-3"> <div class="accordion" id="accordionJobs"> @@ -34,7 +34,7 @@ </div> </div> <div class="container py-3"> - <h3 class="text-primary display-5">Previous Openings</h3> + <h3 class="text-primary display-5">{{ _('Previous Openings') }}</h3> </div> <div class="container py-3"> <div class="row"> @@ -62,6 +62,6 @@ </div> </div> <div class="row"> - <p>Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff. <a href="">We invite you to join us on IRC to find how you can get involved.</a></p> + <p>{{ _("Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="">{{ _("We invite you to join us on IRC to find how you can get involved.") }}</a></p> </div> </div>

1 0

[tpo/master] better strings to translate
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit d4e4a5a2c2b7e2d9618215c281addc0a0386ff2d Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 17:38:32 2019 +0100 better strings to translate --- content/about/people/ln5/contents.lr | 4 ++-- content/about/people/matt-core/contents.lr | 3 +-- content/about/people/matt/contents.lr | 6 ++---- content/about/people/moritz/contents.lr | 3 +-- content/about/people/nickm/contents.lr | 3 +-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/content/about/people/ln5/contents.lr b/content/about/people/ln5/contents.lr index 440a0be..d70bd6f 100644 --- a/content/about/people/ln5/contents.lr +++ b/content/about/people/ln5/contents.lr @@ -10,5 +10,5 @@ pronoun: he --- description: -Software developer, sysadmin and co-founder of the Swedish Torservers.net partner -:DFRI. Member of the sysadmin team. Runs one of the directory authorities. +Software developer, sysadmin and co-founder of the Swedish Torservers.net partner :DFRI. +Member of the sysadmin team. Runs one of the directory authorities. diff --git a/content/about/people/matt-core/contents.lr b/content/about/people/matt-core/contents.lr index aa4ff86..aae37e6 100644 --- a/content/about/people/matt-core/contents.lr +++ b/content/about/people/matt-core/contents.lr @@ -10,5 +10,4 @@ nickname: matt --- description: -Chairs the Tor Board of Directors. Professor at the University of Pennsylvania -where he researches security, privacy, and anonymity. +Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity. diff --git a/content/about/people/matt/contents.lr b/content/about/people/matt/contents.lr index 5c1aed8..057f962 100644 --- a/content/about/people/matt/contents.lr +++ b/content/about/people/matt/contents.lr @@ -12,7 +12,5 @@ nickname: matt --- description: -Matt is a professor in the computer and information science department at the -University of Pennsylvania, where he directs the Distributed Systems Laboratory. -He has been doing research on surveillance technology for over 20 years, as well -as cryptography, secure systems, and public policy. +Matt is a professor in the computer and information science department at the University of Pennsylvania, where he directs the Distributed Systems Laboratory. +He has been doing research on surveillance technology for over 20 years, as well as cryptography, secure systems, and public policy. diff --git a/content/about/people/moritz/contents.lr b/content/about/people/moritz/contents.lr index 23b69ba..aa18146 100644 --- a/content/about/people/moritz/contents.lr +++ b/content/about/people/moritz/contents.lr @@ -10,5 +10,4 @@ nickname: moritz --- description: -Co-founder of [torservers.net](https://www.torservers.net/), a network of -non-profit organizations that run Tor exit relays. +Co-founder of [torservers.net](https://www.torservers.net/), a network of non-profit organizations that run Tor exit relays. diff --git a/content/about/people/nickm/contents.lr b/content/about/people/nickm/contents.lr index c4874d7..1858d23 100644 --- a/content/about/people/nickm/contents.lr +++ b/content/about/people/nickm/contents.lr @@ -12,5 +12,4 @@ twitter_handle: nickm_tor --- description: -One of the three original designers of Tor - does a lot of the ongoing design work, -and coordinates and leads ongoing development. +One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.

1 0

[tpo/master] better strings to translate
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit ddee6034eaf26a109bec9679b07a39481bd5714a Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 16:41:52 2019 +0100 better strings to translate --- content/about/people/meejah/contents.lr | 4 +--- content/about/people/micahflee/contents.lr | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/content/about/people/meejah/contents.lr b/content/about/people/meejah/contents.lr index 2cf5c16..25ed2a2 100644 --- a/content/about/people/meejah/contents.lr +++ b/content/about/people/meejah/contents.lr @@ -10,6 +10,4 @@ twitter: meejah --- description: -[Author](https://meejah.ca/) of [txtorcon](https://github.com/meejah/txtorcon), -[carml](https://github.com/meejah/carml) and other Tor Python tools including -some for bad-relay hunting. +[Author](https://meejah.ca/) of [txtorcon](https://github.com/meejah/txtorcon), [carml](https://github.com/meejah/carml) and other Tor Python tools including some for bad-relay hunting. diff --git a/content/about/people/micahflee/contents.lr b/content/about/people/micahflee/contents.lr index 7a2e128..02dbbd4 100644 --- a/content/about/people/micahflee/contents.lr +++ b/content/about/people/micahflee/contents.lr @@ -10,7 +10,4 @@ twitter: micahflee --- description: -Developer of [OnionShare](https://github.com/micahflee/onionshare) and -[Tor Browser Launcher](https://github.com/micahflee/torbrowser-launcher) journalist -and security engineer at [The Intercept](https://theintercept.com/staff/micah-lee/) -and advocate for [freedom of the press](https://freedom.press/). +Developer of [OnionShare](https://github.com/micahflee/onionshare) and [Tor Browser Launcher](https://github.com/micahflee/torbrowser-launcher) journalist and security engineer at [The Intercept](https://theintercept.com/staff/micah-lee/) and advocate for [freedom of the press](https://freedom.press/).

1 0

[tpo/master] Merge branch 'staging'
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 530331a95807603311a9dafe6ecbe5a623fd0d8e Merge: 5b6be9a d4e4a5a Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 16:13:46 2019 +0100 Merge branch 'staging' configs/i18n.ini | 3 ++- content/about/history/contents.lr | 25 +++++++++++++++++-------- content/about/people/agrabeli/contents.lr | 3 +-- content/about/people/biella/contents.lr | 13 ++++--------- content/about/people/catalyst/contents.lr | 4 ++-- content/about/people/cindy/contents.lr | 13 +++---------- content/about/people/ewyatt/contents.lr | 3 +-- content/about/people/flexlibris/contents.lr | 5 ++--- content/about/people/gunner/contents.lr | 5 ++--- content/about/people/julius/contents.lr | 13 +++++-------- content/about/people/ln5/contents.lr | 4 ++-- content/about/people/matt-core/contents.lr | 3 +-- content/about/people/matt/contents.lr | 6 ++---- content/about/people/meejah/contents.lr | 4 +--- content/about/people/megan/contents.lr | 15 ++++----------- content/about/people/micahflee/contents.lr | 5 +---- content/about/people/moritz/contents.lr | 3 +-- content/about/people/mtigas/contents.lr | 4 +--- content/about/people/n8fr8/contents.lr | 5 +++-- content/about/people/nickm/contents.lr | 3 +-- content/about/people/nighat/contents.lr | 16 ++++++---------- content/about/people/nyinz/contents.lr | 3 +-- content/about/people/pari/contents.lr | 3 +-- content/about/people/phoul/contents.lr | 4 ++-- content/about/people/phw/contents.lr | 5 +---- content/about/people/ramy/contents.lr | 24 +++++++----------------- content/about/people/redshiftzero/contents.lr | 3 +-- content/about/people/sjmurdoch/contents.lr | 5 ++--- content/about/people/syverson/contents.lr | 4 ++-- content/about/people/teor/contents.lr | 3 +-- content/about/people/tjr/contents.lr | 3 +-- content/about/people/wseltzer/contents.lr | 4 ++-- content/download/contents.lr | 1 + models/page.ini | 3 +++ models/people.ini | 3 +++ models/person.ini | 4 ++++ templates/hero-home.html | 6 +++--- templates/jobs.html | 6 +++--- 38 files changed, 100 insertions(+), 139 deletions(-)

1 0

[tpo/staging] Add jobs and modify sponsors
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit dde07218cecbdd1264457b3a00c411c613bf48d8 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 15:59:07 2019 +0100 Add jobs and modify sponsors --- assets/static/images/sponsors/OTF.jpg | Bin 0 -> 22698 bytes assets/static/images/sponsors/USSD.png | Bin 0 -> 499319 bytes assets/static/images/sponsors/artwork.png | Bin 0 -> 22387 bytes assets/static/images/sponsors/artwork(a)2x.png | Bin 0 -> 46793 bytes assets/static/images/sponsors/cymru.png | Bin 0 -> 18259 bytes assets/static/images/sponsors/darpa.png | Bin 0 -> 525926 bytes assets/static/images/sponsors/fastly.svg | 1 + assets/static/images/sponsors/handshake.svg | 13 ++ assets/static/images/sponsors/imls.png | Bin 0 -> 31458 bytes assets/static/images/sponsors/mdf.jpg | Bin 0 -> 11032 bytes assets/static/images/sponsors/mozilla.jpg | Bin 0 -> 15093 bytes assets/static/images/sponsors/nsf.png | Bin 0 -> 1434049 bytes assets/static/images/sponsors/rose.png | Bin 0 -> 37996 bytes assets/static/images/sponsors/sida.png | Bin 0 -> 3355 bytes content/about/jobs/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 79 ++++++++++++ .../jobs/senior-system-administrator/contents.lr | 59 +++++++++ content/about/sponsors/DARPA-nrl/contents.lr | 21 ++++ content/about/sponsors/DARPA-penn/contents.lr | 21 ++++ .../about/sponsors/USSD-DHRL-harvard/contents.lr | 18 +++ content/about/sponsors/USSD-DHRL/contents.lr | 18 +++ content/about/sponsors/access-now/contents.lr | 9 ++ content/about/sponsors/anonymous-ngo/contents.lr | 9 ++ content/about/sponsors/bbg/contents.lr | 9 ++ content/about/sponsors/bell-security/contents.lr | 9 ++ content/about/sponsors/contents.lr | 2 + content/about/sponsors/cyber-ta/contents.lr | 9 ++ content/about/sponsors/cymru/contents.lr | 15 +++ content/about/sponsors/disconnect/contents.lr | 9 ++ content/about/sponsors/eff/contents.lr | 9 ++ content/about/sponsors/fastly/contents.lr | 13 ++ content/about/sponsors/ffo-germany/contents.lr | 9 ++ content/about/sponsors/ford-foundation/contents.lr | 9 ++ content/about/sponsors/freedom-press/contents.lr | 9 ++ content/about/sponsors/google-soc/contents.lr | 9 ++ content/about/sponsors/google/contents.lr | 9 ++ content/about/sponsors/handshake/contents.lr | 15 +++ content/about/sponsors/hivos/contents.lr | 9 ++ content/about/sponsors/hrw/contents.lr | 9 ++ content/about/sponsors/imls-ny/contents.lr | 15 +++ content/about/sponsors/individuals/contents.lr | 15 +++ content/about/sponsors/internews-eu/contents.lr | 9 ++ content/about/sponsors/mdf/contents.lr | 15 +++ content/about/sponsors/mozilla/contents.lr | 15 +++ content/about/sponsors/ncf/contents.lr | 9 ++ content/about/sponsors/nlnet/contents.lr | 9 ++ content/about/sponsors/nrl/contents.lr | 9 ++ content/about/sponsors/nsf-drexel/contents.lr | 15 +++ content/about/sponsors/nsf-georgetown/contents.lr | 15 +++ .../sponsors/nsf-illinois-chicago/contents.lr | 15 +++ content/about/sponsors/nsf-minnesota/contents.lr | 15 +++ content/about/sponsors/nsf-princeton/contents.lr | 15 +++ content/about/sponsors/nsf-rice/contents.lr | 15 +++ content/about/sponsors/nsf-rochester/contents.lr | 15 +++ content/about/sponsors/omidyar/contents.lr | 9 ++ content/about/sponsors/otf/contents.lr | 15 +++ content/about/sponsors/reddit/contents.lr | 9 ++ content/about/sponsors/rose/contents.lr | 15 +++ content/about/sponsors/shinjiru/contents.lr | 9 ++ content/about/sponsors/sida/contents.lr | 15 +++ content/about/sponsors/sri/contents.lr | 9 ++ content/about/sponsors/torfox/contents.lr | 9 ++ i18n/_compiled/en/LC_MESSAGES/contents.mo | Bin 1439 -> 1581 bytes i18n/_compiled/es/LC_MESSAGES/contents.mo | Bin 1586 -> 363 bytes i18n/_compiled/fr/LC_MESSAGES/contents.mo | Bin 1429 -> 362 bytes i18n/contents.pot | 2 +- models/job.ini | 23 ++++ models/jobs.ini | 27 +++++ models/sponsor.ini | 28 +++++ models/sponsors.ini | 28 +++++ templates/about.html | 7 ++ templates/job.html | 1 + templates/jobs.html | 57 ++------- templates/macros/jobs.html | 16 +++ templates/macros/people.html | 4 +- templates/macros/sponsors.html | 9 ++ templates/people.html | 4 +- templates/sponsor.html | 1 + templates/sponsors.html | 132 +++------------------ 79 files changed, 868 insertions(+), 165 deletions(-) diff --git a/assets/static/images/sponsors/OTF.jpg b/assets/static/images/sponsors/OTF.jpg new file mode 100644 index 0000000..57816d3 Binary files /dev/null and b/assets/static/images/sponsors/OTF.jpg differ diff --git a/assets/static/images/sponsors/USSD.png b/assets/static/images/sponsors/USSD.png new file mode 100644 index 0000000..de3edeb Binary files /dev/null and b/assets/static/images/sponsors/USSD.png differ diff --git a/assets/static/images/sponsors/artwork.png b/assets/static/images/sponsors/artwork.png new file mode 100644 index 0000000..3b006d8 Binary files /dev/null and b/assets/static/images/sponsors/artwork.png differ diff --git a/assets/static/images/sponsors/artwork(a)2x.png b/assets/static/images/sponsors/artwork(a)2x.png new file mode 100644 index 0000000..66021f8 Binary files /dev/null and b/assets/static/images/sponsors/artwork(a)2x.png differ diff --git a/assets/static/images/sponsors/cymru.png b/assets/static/images/sponsors/cymru.png new file mode 100644 index 0000000..f31f95b Binary files /dev/null and b/assets/static/images/sponsors/cymru.png differ diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png new file mode 100644 index 0000000..be4405f Binary files /dev/null and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/fastly.svg b/assets/static/images/sponsors/fastly.svg new file mode 100644 index 0000000..c48b42d --- /dev/null +++ b/assets/static/images/sponsors/fastly.svg @@ -0,0 +1 @@ +<svg enable-background="new 0 0 1709 768" viewBox="0 0 1709 768" xmlns="http://www.w3.org/2000/svg"><g fill="#e82c2a"><path d="m1154.2 134.3v421.1h126.4v-64.3h-41.8v-420.9h-84.7z"/><path d="m55.9 491.1h43v-203.2h-43v-55.9l43-7.1v-56.6c0-68.5 14.9-98.2 102.3-98.2 18.9 0 41.2 2.8 60.8 6.3l-11.6 68.9c-13.3-2.1-19.8-2.5-28.2-2.5-30.8 0-38.6 3.1-38.6 33.1v49.1h63.9v62.9h-63.9v203.1h42.5v64.3h-170.2v-64.2z"/><path d="m1111.1 470.7c-13.2 2.8-24.8 2.5-33.2 2.7-34.8.9-31.8-10.6-31.8-43.5v-142h66.3v-62.9h-66.4v-154.8h-84.7v377.3c0 74.1 18.3 107.9 98 107.9 18.9 0 44.8-4.9 64.4-9z"/><path d="m1637.2 491.4c17.8 0 32.2 14.1 32.2 32 0 17.8-14.4 31.9-32.2 31.9s-32.1-14.1-32.1-31.9 14.3-32 32.1-32m0 58.9c14.8 0 26.8-12.1 26.8-26.9s-12-26.6-26.8-26.6-26.7 11.8-26.7 26.6 11.9 26.9 26.7 26.9m5.9-11.2-6.5-9.5h-4.5v9.5h-7.2v-31.4h13.1c7.8 0 12.6 3.9 12.6 10.9 0 5.1-2.6 8.6-6.6 9.8l7.8 10.8h-8.7zm-10.9-15.8h5.7c3.3 0 5.5-1.3 5.5-4.7 0-3.3-2.2-4.6-5.3-4.6h-5.9z"/><path d="m855.6 287.8v-11.3c-25.6-4.7-51.1- 4.7-64.9-4.7-39.4 0-44.2 20.9-44.2 32.2 0 16 5.5 24.7 48.2 34 62.4 14 125.1 28.6 125.1 106 0 73.4-37.8 111.3-117.3 111.3-53.2 0-104.8-11.4-144.2-21.4v-63.2h64.1v11.2c27.6 5.3 56.5 4.8 71.6 4.8 42 0 48.8-22.6 48.8-34.6 0-16.7-12.1-24.7-51.5-32.7-74.2-12.7-133.2-38-133.2-113.5 0-71.4 47.7-99.4 127.3-99.4 53.9 0 94.8 8.4 134.2 18.4v62.8h-64z"/><path d="m465.9 343.4-6.4-6.4-32.7 28.5c-1.7-.6-3.4-.9-5.3-.9-8.8 0-16 7.4-16 16.4 0 9.1 7.2 16.4 16 16.4s16-7.4 16-16.4c0-1.7-.3-3.4-.7-4.9z"/><path d="m595.6 470.7-.1-263.6h-84.7v24.7c-17.4-10.5-36.9-17.9-57.6-21.8h.5v-29.2h10.3v-21.5h-85.3v21.5h10.3v29.2h.6c-81 14.9-142.4 85.8-142.4 171.2 0 96.2 77.9 174.1 174.1 174.1 32.8 0 63.5-9.1 89.7-24.9l15.3 24.9h89.5v-84.7h-20.2zm-169.1-.1v-10h-10.1v9.9c-45.5-2.6-81.8-39.2-84.2-84.7h10.1v-10.1h-10c2.7-45.2 38.9-81.4 84.1-84v10h10.1v-10c44.6 2.4 80.5 37.4 84.4 81.5v2.9h-10.2v10.1h10.2v2.8c-3.8 44.2-39.8 79.2-84.4 81.6z"/><path d="m1495 225h174.7v62.9h-41.8l-107.1 263.6c-30.7 74-81.1 143.7-157.9 143.7-18 .9 0-44-2.1-61.5-6.3l7.7-76.9c11.2 2.1 25.8 3.5 33.5 3.5 35.6 0 75.8-22.1 88.4-60.5l-108.6-267.1h-41.8v-62.9h174.8v62.9h-41.7l61.5 151.3 61.5-151.3h-41.7z"/></g></svg> \ No newline at end of file diff --git a/assets/static/images/sponsors/handshake.svg b/assets/static/images/sponsors/handshake.svg new file mode 100644 index 0000000..fc30a3f --- /dev/null +++ b/assets/static/images/sponsors/handshake.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="151px" height="49px" viewBox="0 0 151 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>logo-dark</title> + <desc>Created with Sketch.</desc> + <defs/> + <g id="logo-dark" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Group" transform="translate(1.000000, 1.000000)" fill="#000000"> + <path d="M38.8479955,15.3309324 L35.9273385,10.142414 L41.5857461,10.1440899 C41.7369154,10.1440899 41.9131403,10.2446425 41.9958241,10.3803887 C42.0860245,10.5287039 42.5453786,11.2862007 43.0974388,12.1962025 C43.7580735,13.2855233 44.5481626,14.5876805 45,15.3309324 L38.8479955,15.3309324 Z M28.3822383,46.7544839 C28.2452673,47 28.0673719,47 28.0097439,47 L25.6979399,47 C24.4743875,46.9991621 23.0629176,46.9983241 22.2227171,46.9983241 L31.2135301,30.8571047 C31.363029,30.5889642 31.3596882,30.2621679 31.204343,29.9973792 C31.0489978,29.7325905 30.7667038,29.5700303 30.4610245,29.5700303 L30.4601893,29.5700303 L15.136971,29.5901408 L12.0902004,24.3144767 L34.4089644,24.3144767 C34.4106347,24.3144767 34.4123051,24.3136388 34.4148107,24.3136388 C34.4173163,24.3136388 34.4189866,24.3144767 34.420657,24.3144767 C34.4331849,24.3144767 34.4448775,24.310287 34.4574053,24.3094491 C34.5075167,24.3060973 34.5576281,24.3010697 34.6052339,24.2893386 C34.6419822,24.2809592 34.6778 953,24.269228 34.7138085,24.255821 C34.7330178,24.2482796 34.751392,24.2407381 34.7697661,24.2323587 C34.936804,24.1577821 35.0846325,24.035443 35.1790089,23.8619897 L38.8580178,17.0604386 L44.9315145,17.0604386 L28.3822383,46.7544839 Z M20.7252227,46.1411125 C20.5297884,45.8193439 20.2758909,45.4012123 19.9994432,44.9462114 C19.0698775,43.4119451 17.8788976,41.447816 17.7444321,41.2324657 C17.6993318,41.159565 17.6784521,40.9819219 17.7728285,40.8126582 C17.9883073,40.4255304 22.0573497,33.0960777 23.0487194,31.3095917 L28.9902561,31.3020503 L20.7252227,46.1411125 Z M10.592706,36.0397575 L7.63947661,30.7925833 L10.6160913,25.2127474 L13.6018931,30.3819932 C12.6739978,32.1290961 11.2257795,34.8540738 10.592706,36.0397575 Z M6.62889755,36.8567481 C5.12555679,36.8567481 3.63056793,36.8559101 3.41091314,36.8559101 L3.41007795,36.8559101 C3.26308463,36.8559101 3.08518931,36.7528436 3.00417595,36.6204493 L2.04287305,35.0359066 C1.35801782,33.9063648 0.4844098,32.4659476 0,31.6690676 L6.1 5200445,31.6690676 L9.07182628,36.857586 C8.43457684,36.857586 7.53257238,36.8567481 6.62889755,36.8567481 Z M16.6177617,0.246354074 C16.7547327,0 16.9317929,0 16.9894209,0 L22.8015033,0.000837939027 L13.7864699,16.1420574 C13.7789532,16.1554644 13.7747773,16.1697094 13.7680958,16.1839544 C13.7547327,16.2107684 13.7430401,16.2384204 13.7321826,16.2669103 C13.7229955,16.2945623 13.7146437,16.3213764 13.7071269,16.3490283 C13.7004454,16.3750045 13.6945991,16.4009806 13.6904232,16.4269567 C13.685412,16.4596363 13.6820713,16.491478 13.6812361,16.5233197 C13.6804009,16.5375646 13.6770601,16.5509717 13.6770601,16.5660546 C13.6770601,16.5769478 13.6795657,16.587003 13.6804009,16.5978962 C13.6812361,16.6297379 13.6845768,16.6607417 13.689588,16.6917454 C13.6929287,16.7177215 13.6971047,16.7436976 13.7037862,16.7696737 C13.7104677,16.7973257 13.7196548,16.8233018 13.7288419,16.8501159 C13.738029,16.876092 13.747216,16.902906 13.7589087,16.9280442 C13.7706013,16.9531824 13.7839644,16.9766447 13.7981626,17.0009449 C13.8123608,17.0244072 13.8257238,17.0478695 13.8424276,17.0704938 C13.8582962,17.0931182 13.8766704,17.1140667 13.8958797,17.1358531 C13.9142539,17.1559636 13.9326281,17.1769121 13.9526726,17.1961847 C13.9727171,17.2146194 13.9935969,17.2305402 14.0153118,17.247299 C14.0395323,17.2665716 14.0637528,17.2841683 14.0896437,17.3000891 C14.0996659,17.3059547 14.1071826,17.3134962 14.1172049,17.3193617 C14.1272272,17.3252273 14.1380846,17.3269032 14.1489421,17.3319308 C14.1932071,17.3545552 14.2399777,17.3738278 14.2892539,17.3889107 C14.3067929,17.3939383 14.3234967,17.4006418 14.3418708,17.4048315 C14.40451,17.4199144 14.4688196,17.4291318 14.5364699,17.4291318 C14.5373051,17.4291318 14.5373051,17.4299697 14.5381403,17.4299697 L14.5389755,17.4299697 L14.5398107,17.4299697 L14.9214922,17.4291318 C14.9231626,17.4291318 14.924833,17.4299697 14.9265033,17.4299697 L14.9273385,17.4299697 L29.8655345,17.4098592 C30.2605791,18.0969692 30.9988864,19.3899091 31.627784,20.49 0961 C32.1105234,21.3372794 32.5097439,22.0352826 32.8237751,22.5841326 L10.5943764,22.5841326 C10.5843541,22.5841326 10.575167,22.5874844 10.56598,22.5883223 C10.2636414,22.59335 9.97216036,22.7533963 9.81848552,23.0408094 L6.13864143,29.9387235 L0.0693207127,29.9387235 C2.7185412,25.1842574 16.4407016,0.563095026 16.6177617,0.246354074 Z M24.2873051,0.878998039 L24.8268374,1.76721341 C25.7747773,3.33080763 27.1135857,5.53793903 27.2555679,5.76753432 C27.3006682,5.84043502 27.3215479,6.01724015 27.2263363,6.18734177 L21.9504454,15.6904083 L16.0114143,15.6979497 L24.2873051,0.878998039 Z M34.4047884,10.9543769 L37.3596882,16.2040649 L34.3471604,21.7721697 C33.988029,21.1453913 33.5420379,20.3644322 33.123608,19.6312355 C32.2967706,18.1824389 31.6937639,17.1274737 31.3538419,16.5375646 C31.9961024,15.3619362 33.6940423,12.2515065 34.4047884,10.9543769 Z" id="Fill-1"/> + <path d="M51.12,37 L51.12,24.06 L53.26,24.06 L53.26,29.14 C53.56,28.74 54.38,27.96 55.76,27.96 C57.44,27.96 58.88,28.68 58.88,31.54 L58.88,37 L56.74,37 L56.74,31.96 C56.74,30.52 56.44,29.74 55.14,29.74 C54.18,29.74 53.64,30.12 53.26,30.54 L53.26,37 L51.12,37 Z M64.8,37.2 C63.08,37.2 61.68,36.44 61.68,34.68 C61.68,32.64 63.5,32.1 65.32,32.1 C66.24,32.1 67.22,32.26 67.74,32.42 L67.74,31.7 C67.74,30.56 67.54,29.66 65.9,29.66 C64.66,29.66 63.94,30.16 63.94,31.2 L61.92,31.2 C61.92,28.78 63.9,27.96 66.04,27.96 C68.34,27.96 69.88,28.94 69.88,31.42 L69.88,35.08 C69.88,35.42 70,35.54 70.36,35.54 C70.6,35.54 70.96,35.48 71.2,35.42 L71.2,36.84 C70.84,37 70.16,37.2 69.5,37.2 C68.38,37.2 68.06,36.62 68.06,35.96 L68.06,35.8 C67.6,36.38 66.62,37.2 64.8,37.2 Z M65.3,35.6 C66.42,35.6 67.3,35.22 67.74,34.86 L67.74,33.74 C67.36,33.64 66.54,33.56 65.78,33.56 C64.6,33.56 63.82,33.78 63.82,34.62 C63.82,35.3 64.32,35.6 65.3,35.6 Z M73.52,37 L73.52,28.16 L75.38,28.16 L75.38,29.36 C75.8,28.78 76 .62,27.96 78.12,27.96 C79.8,27.96 81.28,28.68 81.28,31.54 L81.28,37 L79.14,37 L79.14,31.96 C79.14,30.52 78.84,29.74 77.54,29.74 C76.58,29.74 76.04,30.12 75.66,30.54 L75.66,37 L73.52,37 Z M87.72,37.2 C85.76,37.2 84.02,35.84 84.02,32.58 C84.02,29.32 85.8,27.96 87.72,27.96 C89.12,27.96 90,28.68 90.36,29.08 L90.36,24.06 L92.5,24.06 L92.5,37 L90.64,37 L90.64,35.84 C90.18,36.46 89.22,37.2 87.72,37.2 Z M88.38,35.42 C89.28,35.42 89.94,35.04 90.36,34.64 L90.36,30.52 C89.94,30.12 89.28,29.74 88.38,29.74 C86.86,29.74 86.22,30.88 86.22,32.58 C86.22,34.28 86.86,35.42 88.38,35.42 Z M99.74,37.2 C97.38,37.2 95.44,36.4 95.38,34.22 L97.48,34.22 C97.56,35.16 98.52,35.56 99.86,35.56 C101.08,35.56 102.04,35.38 102.04,34.56 C102.04,33.68 100.7,33.54 98.92,33.22 C97.2,32.92 95.54,32.42 95.54,30.56 C95.54,28.74 97.42,27.96 99.6,27.96 C101.78,27.96 103.64,28.54 103.8,30.76 L101.7,30.76 C101.56,29.8 100.54,29.6 99.62,29.6 C98.4,29.6 97.72,29.84 97.72,30.44 C97.72,31.24 98.78,31.38 100.88,31.72 C102.52,31.98 104.24,32.52 104.24,34.34 C104.24,36.48 102.22,37.2 99.74,37.2 Z M107.12,37 L107.12,24.06 L109.26,24.06 L109.26,29.14 C109.56,28.74 110.38,27.96 111.76,27.96 C113.44,27.96 114.88,28.68 114.88,31.54 L114.88,37 L112.74,37 L112.74,31.96 C112.74,30.52 112.44,29.74 111.14,29.74 C110.18,29.74 109.64,30.12 109.26,30.54 L109.26,37 L107.12,37 Z M120.8,37.2 C119.08,37.2 117.68,36.44 117.68,34.68 C117.68,32.64 119.5,32.1 121.32,32.1 C122.24,32.1 123.22,32.26 123.74,32.42 L123.74,31.7 C123.74,30.56 123.54,29.66 121.9,29.66 C120.66,29.66 119.94,30.16 119.94,31.2 L117.92,31.2 C117.92,28.78 119.9,27.96 122.04,27.96 C124.34,27.96 125.88,28.94 125.88,31.42 L125.88,35.08 C125.88,35.42 126,35.54 126.36,35.54 C126.6,35.54 126.96,35.48 127.2,35.42 L127.2,36.84 C126.84,37 126.16,37.2 125.5,37.2 C124.38,37.2 124.06,36.62 124.06,35.96 L124.06,35.8 C123.6,36.38 122.62,37.2 120.8,37.2 Z M121.3,35.6 C122.42,35.6 123.3,35.22 123.74,34.86 L123.74,33.74 C123.36,33.64 122.54,33.56 121.78,33.56 C120.6,33.56 119.82 ,33.78 119.82,34.62 C119.82,35.3 120.32,35.6 121.3,35.6 Z M129.52,37 L129.52,24.06 L131.66,24.06 L131.66,31.5 L135.5,28.16 L138.34,28.16 L134.52,31.4 L138.56,37 L135.98,37 L133,32.58 L131.66,33.66 L131.66,37 L129.52,37 Z M144.72,37.2 C142.16,37.2 140.06,35.94 140.06,32.62 C140.06,29.08 142.42,27.96 144.6,27.96 C146.86,27.96 149.14,29.08 149.14,32.58 L149.14,33.06 L142.22,33.06 C142.28,34.6 143.04,35.54 144.76,35.54 C145.94,35.54 146.76,35.06 146.92,34.2 L149.12,34.2 C148.7,36.48 146.64,37.2 144.72,37.2 Z M142.26,31.56 L146.94,31.56 C146.76,30.2 145.76,29.62 144.6,29.62 C143.44,29.62 142.44,30.2 142.26,31.56 Z" id="handshake-smol"/> + </g> + </g> +</svg> \ No newline at end of file diff --git a/assets/static/images/sponsors/imls.png b/assets/static/images/sponsors/imls.png new file mode 100644 index 0000000..88a3bdf Binary files /dev/null and b/assets/static/images/sponsors/imls.png differ diff --git a/assets/static/images/sponsors/mdf.jpg b/assets/static/images/sponsors/mdf.jpg new file mode 100644 index 0000000..5735900 Binary files /dev/null and b/assets/static/images/sponsors/mdf.jpg differ diff --git a/assets/static/images/sponsors/mozilla.jpg b/assets/static/images/sponsors/mozilla.jpg new file mode 100644 index 0000000..e1d39d8 Binary files /dev/null and b/assets/static/images/sponsors/mozilla.jpg differ diff --git a/assets/static/images/sponsors/nsf.png b/assets/static/images/sponsors/nsf.png new file mode 100644 index 0000000..7c52c69 Binary files /dev/null and b/assets/static/images/sponsors/nsf.png differ diff --git a/assets/static/images/sponsors/rose.png b/assets/static/images/sponsors/rose.png new file mode 100644 index 0000000..6efe42f Binary files /dev/null and b/assets/static/images/sponsors/rose.png differ diff --git a/assets/static/images/sponsors/sida.png b/assets/static/images/sponsors/sida.png new file mode 100644 index 0000000..bb620ee Binary files /dev/null and b/assets/static/images/sponsors/sida.png differ diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr index c88a206..e139c59 100644 --- a/content/about/jobs/contents.lr +++ b/content/about/jobs/contents.lr @@ -1,3 +1,5 @@ +_model: jobs +--- _template: about.html --- section: about diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr new file mode 100644 index 0000000..8e728f6 --- /dev/null +++ b/content/about/jobs/developer-data-architect/contents.lr @@ -0,0 +1,79 @@ +_model: job +--- +active: False +--- +title: Developer Data Architect +--- + +description: + + + +Internet Freedom Nonprofit Seeks Metrics Data Architect +(Posted November 2, 2018) + +The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking an experienced Data Architect to take our metrics work to the next level. + +Tor is for everyone, and we are actively working to build a team that represents people from all over the world — people from diverse ethnic, national, and cultural backgrounds; people from all walks of life. Racial minorities, non-gender-binary people, women, and people from any group that is generally underrepresented in tech are encouraged to apply. + +The team: + +Our Metrics Team has been collecting data since 2004 to help improve the tools we build and learn more about the Tor network. For example, we monitor the number of relays and clients in the network, their respective capabilities, the number of clients connecting via bridges, fluctuations in network speed, etc. Gathering this data results in huge data archives, so we are also working to develop tools to process this data and make it available to everyone. + +How we achieve our goals: + + Robustness (We want to avoid bugs and/or bad design decision that cause us to miss data) + Timeliness (users need up-to-date network status information) + Scalability (as the network grows, so does our data) + Transparency (our community rightly wants to know what data we're collecting) + +The Tor Metrics team presently consists of two full-time developers; this position will be the third. Our team works asynchronously on each person’s own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an occasional video chat. + +The most interesting challenge for the Metrics team is how to gather data on an anonymity system without de-anonymizing users. + +The job: + +The person in this position will work directly with helping us design and refine systems for gathering and analyzing data. The bulk of our code is written in Java, but smaller portions are written in R, Python, PostgreSQL, and JavaScript. Part of this job will be to analyze and fix bugs in our current code and review patches. We will also be migrating parts of our code from Java to Python, and the person in this position will help with that. + +Our main five codebases: + + Collector (https://gitweb.torproject.org/collector.git/ ) + metrics-lib (https://gitweb.torproject.org/metrics-lib.git/ ) + Onionoo (https://gitweb.torproject.org/onionoo.git/ ) + Exonerator (https://gitweb.torproject.org/exonerator.git/ ) + metrics-web (https://gitweb.torproject.org/metrics-web.git/ ) + +Requirements: + +Technical abilities/experience: + + Have experience finding your way into existing Java/Python/R/PostgreSQL code bases and the ability to review patches and make changes to fix bugs/smaller enhancements. + Able to identify shortcomings in our data pipeline and suggest improvements to reduce complexity and future maintenance efforts. + Experience working with Git and Trac or similar issue tracking tools. + Ability to learn quickly and can adapt to our current processes; are able to improve future processes for releasing software and operating services. + Understanding of the inherent privacy implications of gathering data in an anonymity system, the security implications of gathering metrics data from semi-trusted relays in the Tor network, and the challenges of processing large amounts of data per day (specifically performance and scalability challenges). + +Collaborative requirements: + + Ability to work remotely 90% of the time, as most team synchronization happening via email and/or IRC. + Participation in weekly IRC meetings and monthly team video chats. + Willingness and ability to travel internationally up to four times per year, to semi-annual Tor meeting plus up to two team-internal meetings. + Language: write and speak fluent English. + Comfortable posting to a public mailing list or speaking up in a public IRC channel to ask questions, even when you think the question might be obvious or silly. + +Bonus skills: + + Data analysis: Ability to make sense of data sets and use data analysis tools to find and visualize interesting patterns. + Open source attitude: You're accustomed to a pattern of early and frequent releases without attempting to finalize things on your own and have contributed to open source projects before. + Scientific writing: Experience writing technical reports about data findings. + Mathematics: Knowledge of basic statistics. + Networking background: Experience working with networks and measurements in the past. + You support Internet Freedom! + +This is a full-time position that can be done remotely/internationally or in our office in Seattle, WA. To apply, send a cover letter that includes a statement about why you want to work at the Tor Project, your CV/resume (including three professional references), and a link to a code sample or some non-trivial software project you have significantly contributed to. All documents should be in PDF format labeled with your name. Please send to job-metrics at torproject dot org with “Metrics Data Architect” in the subject line. No phone calls please! + +Flexible salary, depending on experience. The Tor Project has a highly competitive benefits package, including a generous PTO policy; paid holidays (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; 401(k); and flexible work schedule. (Please note that benefits package specifics can vary slightly from country to country, but we aim to treat everyone equally.) + +The Tor Project's workforce is smart and committed. The Tor Project currently has a paid and contract staff of around 47 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations. If you’re new to the Tor Project scene, are curious what our workplace culture is like, or just want to read about how fun our semi-annual meetings are, hear what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie. + +The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr new file mode 100644 index 0000000..306f984 --- /dev/null +++ b/content/about/jobs/senior-system-administrator/contents.lr @@ -0,0 +1,59 @@ +_model: job +--- +_template: about.html +--- +active: True +--- +title: Senior System Administrator +--- +summary: + +Internet Freedom Nonprofit Seeks Senior Systems Administrator +(Posted July 25, 2018) + +The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization’s software, hardware, and networks. The goal of the Tor Project’s sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. + +The ideal candidate is resourceful, creative, and able to diagnose and resolve problems quickly. Our sysadmin must have the patience to communicate with a variety of interdisciplinary teams and users, including some who are not technical and others who are extremely technical. The sysadmin will set and guide the strategy for all of our internal technology infrastructure with the participation and assistance of our open source community. This job requires a jack-of-all-trades, and every day is likely to present new and different challenges. + +--- +description: + +The ideal candidate will have at least five years of experience running open source systems. This is a senior level position that reports directly to the Executive Director and is part of the organization’s leadership team. This person will manage one direct report, our Junior Services Administrator. This will be the organization’s first paid sysadmin, and a willingness to work with our highly effective, long-term volunteer sysadmins is essential. +Responsibilities: + + Install and configure software and hardware + Manage network servers and technology tools + Set up accounts and workstations + Monitor performance and maintain systems according to requirements + Must have experience monitoring infrastructure for downtime and compromise + Troubleshoot issues and outages + Ensure security through access controls, backups and firewalls Must understand the security implications of configuration choices + Upgrade systems with new releases and models Must have experience keeping many systems well-patched + Administrate infrastructure, including firewalls, databases, malware protection software and other processes + Assist our staff in selection of new technologies + Develop expertise to train our staff on new technologies + Provide technical support for both hardware and software issues our staff encounter + Build an internal wiki with technical documentation, manuals and IT policies + Supervise the Junior Services Administrator + +Qualifications: + + Proven experience as a System Administrator, Network Administrator or similar role + Experience with databases, networks (LAN, WAN) and patch management + Experience with automation tools that scale (e.g., puppet) + Knowledge of system security (e.g., intrusion detection systems) and data backup/recovery + Ability to create scripts in Python, Perl or other language + Familiarity with various operating systems and platforms + Experience helping users think through how best to achieve their tasks (ie, the right combination of sustainable, safe, easy to deploy and use, does what they want) + Great intuition about what service and config choices will keep things from going out of control + Must be or become strongly trusted by our community + Resourcefulness and problem-solving aptitude + Excellent communication skills + +The Tor Project's workforce is smart and committed. Experience working with open source communities is required. Dedication to Internet freedom is an added plus. The Tor Project currently has a paid staff of around 40 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The ideal candidate will be energetic, unflappable and flexible, and will thrive in a highly-technical collaborative environment. + +This is a full-time, hands-on position, which can be done remotely or in our office in Seattle, WA. Flexible salary, depending on experience. The Tor Project has a competitive benefits package, including a generous PTO policy; 14 paid holidays per year (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; flexible work schedule; and occasional travel opportunities. + +To apply, send your resume to hr at torproject dot org with the subject "Systems Administrator." Include a cover letter that tells us why you think you're the right person for this job. No phone calls please! + +The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/sponsors/DARPA-nrl/contents.lr b/content/about/sponsors/DARPA-nrl/contents.lr new file mode 100644 index 0000000..f3b0acc --- /dev/null +++ b/content/about/sponsors/DARPA-nrl/contents.lr @@ -0,0 +1,21 @@ +_model: sponsor +--- +active: False +--- +time: 2001 - 2006 +--- +name: DARPA and ONR via Naval Research Laboratory +--- +logo: /static/images/sponsors/darpa.png +--- +link: https://www.darpa.mil/program/extreme-ddos-defense +--- +description: + +DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity +to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: +(1) dispersing cyber assets (physically and/or logically) to complicate adversarial +targeting; (2) disguising the characteristics and behaviors of those assets through +networked maneuver to confuse or deceive the adversary; and (3) using adaptive +mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the +effects of attacks that succeed in penetrating other defensive measures. diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr new file mode 100644 index 0000000..a69821e --- /dev/null +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -0,0 +1,21 @@ +_model: sponsor +--- +active: True +--- +time: 2018 - 2019 +--- +name: DARPA via University of Pennsylvania +--- +logo: /static/images/sponsors/darpa.png +--- +link: https://www.darpa.mil/program/extreme-ddos-defense +--- +description: + +DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity +to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: +(1) dispersing cyber assets (physically and/or logically) to complicate adversarial +targeting; (2) disguising the characteristics and behaviors of those assets through +networked maneuver to confuse or deceive the adversary; and (3) using adaptive +mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the +effects of attacks that succeed in penetrating other defensive measures. diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr new file mode 100644 index 0000000..10b40d5 --- /dev/null +++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr @@ -0,0 +1,18 @@ +_model: sponsor +--- +active: True +--- +time: 2017 - 2019 +--- +name: U.S. Department of State Bureau of Democracy, Human Rights, and Labor via Harvard +--- +logo: /static/images/sponsors/USSD.png +--- +link: https://www.state.gov/j/drl/ +--- +description: + +The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote +[democracy](http://www.state.gov/j/drl/democ/), protect [human rights](http://www.state.gov/j/drl/hr/) +and [international religious freedom](http://www.state.gov/j/drl/irf/), and +advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally. diff --git a/content/about/sponsors/USSD-DHRL/contents.lr b/content/about/sponsors/USSD-DHRL/contents.lr new file mode 100644 index 0000000..014919e --- /dev/null +++ b/content/about/sponsors/USSD-DHRL/contents.lr @@ -0,0 +1,18 @@ +_model: sponsor +--- +active: True +--- +time: 2013 - 2019 +--- +name: U.S. Department of State Bureau of Democracy, Human Rights, and Labor +--- +logo: /static/images/sponsors/USSD.png +--- +link: https://www.state.gov/j/drl/ +--- +description: + +The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote +[democracy](http://www.state.gov/j/drl/democ/), protect [human rights](http://www.state.gov/j/drl/hr/) +and [international religious freedom](http://www.state.gov/j/drl/irf/), and +advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally. diff --git a/content/about/sponsors/access-now/contents.lr b/content/about/sponsors/access-now/contents.lr new file mode 100644 index 0000000..6b052c4 --- /dev/null +++ b/content/about/sponsors/access-now/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2012 +--- +name: Access Now +--- +link: https://www.accessnow.org/ diff --git a/content/about/sponsors/anonymous-ngo/contents.lr b/content/about/sponsors/anonymous-ngo/contents.lr new file mode 100644 index 0000000..b6fc471 --- /dev/null +++ b/content/about/sponsors/anonymous-ngo/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2008-2013 +--- +name: An anonymous North American NGO +--- +link: diff --git a/content/about/sponsors/bbg/contents.lr b/content/about/sponsors/bbg/contents.lr new file mode 100644 index 0000000..f583dbf --- /dev/null +++ b/content/about/sponsors/bbg/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 - 2013 +--- +name: Broadcasting Board of Governors +--- +link: http://www.bbg.gov/ diff --git a/content/about/sponsors/bell-security/contents.lr b/content/about/sponsors/bell-security/contents.lr new file mode 100644 index 0000000..19129ff --- /dev/null +++ b/content/about/sponsors/bell-security/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 +--- +name: Bell Security Solutions Inc +--- +link: diff --git a/content/about/sponsors/contents.lr b/content/about/sponsors/contents.lr index 4804a04..2d54703 100644 --- a/content/about/sponsors/contents.lr +++ b/content/about/sponsors/contents.lr @@ -1,3 +1,5 @@ +_model: sponsors +--- _template: about.html --- section: about diff --git a/content/about/sponsors/cyber-ta/contents.lr b/content/about/sponsors/cyber-ta/contents.lr new file mode 100644 index 0000000..f7a3a75 --- /dev/null +++ b/content/about/sponsors/cyber-ta/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 - 2008 +--- +name: Cyber-TA project +--- +link: http://www.cyber-ta.org/ diff --git a/content/about/sponsors/cymru/contents.lr b/content/about/sponsors/cymru/contents.lr new file mode 100644 index 0000000..3a4d4d5 --- /dev/null +++ b/content/about/sponsors/cymru/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2009 - Present +--- +name: Team Cymru +--- +logo: /static/images/sponsors/cymru.png +--- +link: https://www.team-cymru.org/ +--- +description: + +Team Cymru has over a decade of experience and expertise at providing unparalleled threat intelligence and insight for security vendors, network defenders, incident response teams, and analysts. diff --git a/content/about/sponsors/disconnect/contents.lr b/content/about/sponsors/disconnect/contents.lr new file mode 100644 index 0000000..6228207 --- /dev/null +++ b/content/about/sponsors/disconnect/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2014 +--- +name: Disconnect +--- +link: https://disconnect.me/ diff --git a/content/about/sponsors/eff/contents.lr b/content/about/sponsors/eff/contents.lr new file mode 100644 index 0000000..f97427f --- /dev/null +++ b/content/about/sponsors/eff/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2004 - 2005 +--- +name: Electronic Frontier Foundation +--- +link: https://www.eff.org diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr new file mode 100644 index 0000000..46088f2 --- /dev/null +++ b/content/about/sponsors/fastly/contents.lr @@ -0,0 +1,13 @@ +_model: sponsor +--- +active: True +--- +time: 2016 - 2018 +--- +name: Fastly +--- +logo: /static/images/sponsors/fastly.svg +--- +link: https://www.fastly.com/ +--- +description: diff --git a/content/about/sponsors/ffo-germany/contents.lr b/content/about/sponsors/ffo-germany/contents.lr new file mode 100644 index 0000000..73f7fe2 --- /dev/null +++ b/content/about/sponsors/ffo-germany/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2014 - 2015 +--- +name: Hivos/The Digital Defenders Partnership +--- +link: https://digitaldefenders.org/ diff --git a/content/about/sponsors/ford-foundation/contents.lr b/content/about/sponsors/ford-foundation/contents.lr new file mode 100644 index 0000000..9fddef8 --- /dev/null +++ b/content/about/sponsors/ford-foundation/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2013 - 2014 +--- +name: The Ford Foundation +--- +link: https://www.fordfoundation.org/ diff --git a/content/about/sponsors/freedom-press/contents.lr b/content/about/sponsors/freedom-press/contents.lr new file mode 100644 index 0000000..7588ef7 --- /dev/null +++ b/content/about/sponsors/freedom-press/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2014 +--- +name: Freedom of the Press Foundation +--- +link: https://freedom.press/ diff --git a/content/about/sponsors/google-soc/contents.lr b/content/about/sponsors/google-soc/contents.lr new file mode 100644 index 0000000..b7dc712 --- /dev/null +++ b/content/about/sponsors/google-soc/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2007-2014 and 2016-2017 +--- +name: Google Summer of Code +--- +link: https://developers.google.com/open-source/gsoc/ diff --git a/content/about/sponsors/google/contents.lr b/content/about/sponsors/google/contents.lr new file mode 100644 index 0000000..6b0483b --- /dev/null +++ b/content/about/sponsors/google/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2008 - 2009 +--- +name: Google +--- +link: http://code.google.com/opensource/ diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr new file mode 100644 index 0000000..bb7f6fd --- /dev/null +++ b/content/about/sponsors/handshake/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2010 - 2013, 2017 - 2020 +--- +name: The Handshake Foundation +--- +logo: /static/images/sponsors/handshake.svg +--- +link: https://handshake.org/ +--- +description: + +Handshake is a decentralized, permissionless naming protocol compatible with DNS where every peer is validating and in charge of managing the root zone with the goal of creating an alternative to existing Certificate Authorities. Its purpose is not to replace the DNS protocol, but to replace the root zone file and the root servers with a public commons. diff --git a/content/about/sponsors/hivos/contents.lr b/content/about/sponsors/hivos/contents.lr new file mode 100644 index 0000000..dfc2ca6 --- /dev/null +++ b/content/about/sponsors/hivos/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2015 +--- +name: Federal Foreign Office of Germany +--- +link: http://www.auswaertiges-amt.de/ diff --git a/content/about/sponsors/hrw/contents.lr b/content/about/sponsors/hrw/contents.lr new file mode 100644 index 0000000..e8754dc --- /dev/null +++ b/content/about/sponsors/hrw/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2007 +--- +name: Human Rights Watch +--- +link: http://www.hrw.org/ diff --git a/content/about/sponsors/imls-ny/contents.lr b/content/about/sponsors/imls-ny/contents.lr new file mode 100644 index 0000000..1243e54 --- /dev/null +++ b/content/about/sponsors/imls-ny/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2017 - 2020 +--- +name: Institute of Museum and Library Services via New York University +--- +logo: /static/images/sponsors/imls.png +--- +link: https://www.imls.gov/ +--- +description: + +Institute of Museum and Library Services advances, supports, and empowers America's museums, libraries, and related organizations through grantmaking, research, and policy development. diff --git a/content/about/sponsors/individuals/contents.lr b/content/about/sponsors/individuals/contents.lr new file mode 100644 index 0000000..909fcea --- /dev/null +++ b/content/about/sponsors/individuals/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2006 - Present +--- +name: Tens of thousands of individuals like you +--- +logo: /static/images/sponsors/artwork.png +--- +link: https://www.torproject.org/donate/donate.html.en +--- +description: + +Donations from individuals allow us to easily allocate resources to emergent events that require our response and to reorder our priorities whenever needed. This is extremely important for any software development organization, especially one that provides essential safety to people in volatile locations like Tor. diff --git a/content/about/sponsors/internews-eu/contents.lr b/content/about/sponsors/internews-eu/contents.lr new file mode 100644 index 0000000..73e695c --- /dev/null +++ b/content/about/sponsors/internews-eu/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 - 2008 +--- +name: Internews Europe +--- +link: diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr new file mode 100644 index 0000000..bc64470 --- /dev/null +++ b/content/about/sponsors/mdf/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2016 - 2018 +--- +name: Media Democracy Found +--- +logo: /static/images/sponsors/mdf.jpg +--- +link: http://mediademocracyfund.org/ +--- +description: + +MDF’s deep expertise in media and technology policy and partnerships with public interest and civil society organizations around the world enable them to guide their funding partners through the rapidly changing issues and develop strategies that address priorities in digital equity and rights. diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr new file mode 100644 index 0000000..48ff4f0 --- /dev/null +++ b/content/about/sponsors/mozilla/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2016 - 2018 +--- +name: Mozilla +--- +logo: /static/images/sponsors/mozilla.jpg +--- +link: https://www.mozilla.org/en-US/moss/ +--- +description: + +Mozilla was born out of and remains part of the open source and free software movement. Through the Mozilla Open Source Support (MOSS) awards program, Mozilla recognizes, celebrates, and supports open source projects that contribute to Mozilla’s work and to the health of the Internet. diff --git a/content/about/sponsors/ncf/contents.lr b/content/about/sponsors/ncf/contents.lr new file mode 100644 index 0000000..e5b1414 --- /dev/null +++ b/content/about/sponsors/ncf/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2010-2012, 2014 +--- +name: National Christian Foundation +--- +link: http://www.nationalchristian.com/ diff --git a/content/about/sponsors/nlnet/contents.lr b/content/about/sponsors/nlnet/contents.lr new file mode 100644 index 0000000..74dd658 --- /dev/null +++ b/content/about/sponsors/nlnet/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2008 - 2009 +--- +name: NLnet Foundation +--- +link: http://www.nlnet.nl/ diff --git a/content/about/sponsors/nrl/contents.lr b/content/about/sponsors/nrl/contents.lr new file mode 100644 index 0000000..dc77f91 --- /dev/null +++ b/content/about/sponsors/nrl/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 - 2010 +--- +name: Naval Research Laboratory +--- +link: http://www.nrl.navy.mil/ diff --git a/content/about/sponsors/nsf-drexel/contents.lr b/content/about/sponsors/nsf-drexel/contents.lr new file mode 100644 index 0000000..97957e3 --- /dev/null +++ b/content/about/sponsors/nsf-drexel/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: False +--- +time: 2009 - 2011 +--- +name: National Science Foundation via Drexel University +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-georgetown/contents.lr b/content/about/sponsors/nsf-georgetown/contents.lr new file mode 100644 index 0000000..202b6b0 --- /dev/null +++ b/content/about/sponsors/nsf-georgetown/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2015 - 2019 +--- +name: National Science Foundation joint with Georgetown +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-illinois-chicago/contents.lr b/content/about/sponsors/nsf-illinois-chicago/contents.lr new file mode 100644 index 0000000..2e93dc3 --- /dev/null +++ b/content/about/sponsors/nsf-illinois-chicago/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2016 - 2018 +--- +name: National Science Foundation joint with University of Illinois at Chicago +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-minnesota/contents.lr b/content/about/sponsors/nsf-minnesota/contents.lr new file mode 100644 index 0000000..22b0ca0 --- /dev/null +++ b/content/about/sponsors/nsf-minnesota/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2013 - 2018 +--- +name: National Science Foundation via University of Minnesota +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-princeton/contents.lr b/content/about/sponsors/nsf-princeton/contents.lr new file mode 100644 index 0000000..7dda390 --- /dev/null +++ b/content/about/sponsors/nsf-princeton/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2012 - 2018 +--- +name: National Science Foundation joint with Princeton University +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-rice/contents.lr b/content/about/sponsors/nsf-rice/contents.lr new file mode 100644 index 0000000..56c5474 --- /dev/null +++ b/content/about/sponsors/nsf-rice/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2006 - 2007 +--- +name: National Science Foundation via Rice University +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr new file mode 100644 index 0000000..703d11d --- /dev/null +++ b/content/about/sponsors/nsf-rochester/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2016 - 2019 +--- +name: National Science Foundation joint with Rochester Institute of Technology +--- +logo: /static/images/sponsors/nsf.png +--- +link: https://nsf.gov/ +--- +description: + +The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research. diff --git a/content/about/sponsors/omidyar/contents.lr b/content/about/sponsors/omidyar/contents.lr new file mode 100644 index 0000000..93ce420 --- /dev/null +++ b/content/about/sponsors/omidyar/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2006 +--- +name: Omidyar Network Enzyme Grant +--- +link: https://www.omidyar.com/ diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr new file mode 100644 index 0000000..ef21336 --- /dev/null +++ b/content/about/sponsors/otf/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2012 - 2019 +--- +name: Open Technology Fund +--- +logo: /static/images/sponsors/OTF.jpg +--- +link: https://www.opentech.fund/ +--- +description: + +OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. The daily suppression of free expression and information limits everyone's ability to take full advantage of the powerful communications platform that the internet has become. diff --git a/content/about/sponsors/reddit/contents.lr b/content/about/sponsors/reddit/contents.lr new file mode 100644 index 0000000..07ca544 --- /dev/null +++ b/content/about/sponsors/reddit/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2015 +--- +name: Reddit +--- +link: https://www.reddit.com/ diff --git a/content/about/sponsors/rose/contents.lr b/content/about/sponsors/rose/contents.lr new file mode 100644 index 0000000..49a48a8 --- /dev/null +++ b/content/about/sponsors/rose/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2017 - 2019 +--- +name: Rose Foundation for Communities and the Environment +--- +logo: /static/images/sponsors/rose.png +--- +link: https://rosefdn.org/ +--- +description: + +The Rose Foundation builds and maintains a bridge between the community and organized philanthropy; protects the natural environment, public health, and community and consumer rights; promotes collaboration between labor, environmental, business, consumer and social interests; cultivates a new generation of environmental stewards and social policy leaders; respects the inalienable rights protected by our nation’s constitution, and the essential human rights to clean air, clean water, and individual dignity and privacy. diff --git a/content/about/sponsors/shinjiru/contents.lr b/content/about/sponsors/shinjiru/contents.lr new file mode 100644 index 0000000..3a5542b --- /dev/null +++ b/content/about/sponsors/shinjiru/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2009 - 2011 +--- +name: Shinjiru Technology +--- +link: http://www.shinjiru.com/ diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr new file mode 100644 index 0000000..67b401f --- /dev/null +++ b/content/about/sponsors/sida/contents.lr @@ -0,0 +1,15 @@ +_model: sponsor +--- +active: True +--- +time: 2010 - 2013, 2017 - 2020 +--- +name: Sida - Swedish International Development Cooperation Agency +--- +logo: /static/images/sponsors/sida.png +--- +link: https://www.sida.se/English/ +--- +description: + +Sida is a government agency working on behalf of the Swedish parliament and government, with the mission to reduce poverty in the world. Through their work and in cooperation with others, Sida contributes to implementing Sweden’s Policy for Global Development. diff --git a/content/about/sponsors/sri/contents.lr b/content/about/sponsors/sri/contents.lr new file mode 100644 index 0000000..e4df07f --- /dev/null +++ b/content/about/sponsors/sri/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2011-2017 +--- +name: SRI International +--- +link: https://www.sri.com/ diff --git a/content/about/sponsors/torfox/contents.lr b/content/about/sponsors/torfox/contents.lr new file mode 100644 index 0000000..42f2464 --- /dev/null +++ b/content/about/sponsors/torfox/contents.lr @@ -0,0 +1,9 @@ +_model: sponsor +--- +active: False +--- +time: 2009 +--- +name: Torfox +--- +link: http://www.torfox.org/ diff --git a/i18n/_compiled/en/LC_MESSAGES/contents.mo b/i18n/_compiled/en/LC_MESSAGES/contents.mo index 2a97dec..eee9bbd 100644 Binary files a/i18n/_compiled/en/LC_MESSAGES/contents.mo and b/i18n/_compiled/en/LC_MESSAGES/contents.mo differ diff --git a/i18n/_compiled/es/LC_MESSAGES/contents.mo b/i18n/_compiled/es/LC_MESSAGES/contents.mo index 890bf40..6e84656 100644 Binary files a/i18n/_compiled/es/LC_MESSAGES/contents.mo and b/i18n/_compiled/es/LC_MESSAGES/contents.mo differ diff --git a/i18n/_compiled/fr/LC_MESSAGES/contents.mo b/i18n/_compiled/fr/LC_MESSAGES/contents.mo index c05783d..e660b2d 100644 Binary files a/i18n/_compiled/fr/LC_MESSAGES/contents.mo and b/i18n/_compiled/fr/LC_MESSAGES/contents.mo differ diff --git a/i18n/contents.pot b/i18n/contents.pot index 4108749..c4141b8 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-09 20:43+CET\n" +"POT-Creation-Date: 2019-01-17 15:58+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" diff --git a/models/job.ini b/models/job.ini new file mode 100644 index 0000000..b3b90e4 --- /dev/null +++ b/models/job.ini @@ -0,0 +1,23 @@ +[model] +name = Job +label = {{ this.title }} + +[fields.title] +label = Title +type = string + +[fields.link] +label = Link +type = url + +[fields.active] +label = Active +type = boolean + +[fields.summary] +label = Summary +type = markdown + +[fields.description] +label = Description +type = markdown diff --git a/models/jobs.ini b/models/jobs.ini new file mode 100644 index 0000000..6760a58 --- /dev/null +++ b/models/jobs.ini @@ -0,0 +1,27 @@ +[model] +name = Jobs +label = {{ this.title }} + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = job +order_by = title diff --git a/models/sponsor.ini b/models/sponsor.ini new file mode 100644 index 0000000..312475d --- /dev/null +++ b/models/sponsor.ini @@ -0,0 +1,28 @@ +[model] +name = Sponsor +label = {{ this.name }} +hidden = yes + +[fields.name] +label = Name +type = string + +[fields.link] +label = Link +type = url + +[fields.active] +label = Active +type = boolean + +[fields.description] +label = Description +type = markdown + +[fields.logo] +label = Logo +type = string + +[fields.time] +label = Time +type = string diff --git a/models/sponsors.ini b/models/sponsors.ini new file mode 100644 index 0000000..292cbea --- /dev/null +++ b/models/sponsors.ini @@ -0,0 +1,28 @@ +[model] +name = Sponsors +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = sponsor +order_by = name diff --git a/templates/about.html b/templates/about.html index fd486e6..a852600 100644 --- a/templates/about.html +++ b/templates/about.html @@ -18,6 +18,13 @@ <div class="container py-3 preamble"> {{ this.parent.body }} </div> + {% elif this.parent.path == "/about/jobs" %} + <div class="container py-3 preamble"> + {{ this.summary }} + </div> + <div class="container py-3"> + {{ this.description }} + </div> {% else %} <div class="container py-3 preamble"> {{ this.body }} diff --git a/templates/job.html b/templates/job.html new file mode 100644 index 0000000..59b6d40 --- /dev/null +++ b/templates/job.html @@ -0,0 +1 @@ +{{ this.title }} diff --git a/templates/jobs.html b/templates/jobs.html index fece3cd..8ee9c68 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -3,34 +3,11 @@ </div> <div class="container py-3"> <div class="accordion" id="accordionJobs"> - <div class="card border-0"> - <div class="card-header bg-white border-0" id="headingOne"> - <h5 class="mb-0"> - <button class="btn btn-link bg-white" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> - Sr. System Administrator - </button> - </h5> - </div> - <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionJobs"> - <div class="card-body"> - The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization’s software, hardware, and networks. The goal of the Tor Project’s sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. - </div> - </div> - </div> - <div class="card border-0"> - <div class="card-header bg-white border-0" id="headingTwo"> - <h5 class="mb-0"> - <button class="btn btn-link bg-white collapsed" type="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> - Grant Writer - </button> - </h5> - </div> - <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionJobs"> - <div class="card-body"> - The Tor Project, Inc., a 501(c)(3) nonprofit organization that provides technical infrastructure for privacy protection over the Internet, is seeking a strong grant writer to help us develop and write winning grant proposals designed to secure funding from public institutions, private foundations, corporations and other grant-making entities. The ideal candidate will be familiar with issues involving high-tech freedom and can make a compelling case about why our work is so important to current and potential funders. This person must be able to write clearly and provide context for the Tor Project’s complicated technology and activism projects. The ability to explain technical concepts to non-technical audiences is essential. - </div> - </div> - </div> + {% from "macros/jobs.html" import render_active %} + {% set items = this.children %} + {% for item in items.filter(F.active == True) %} + {{ render_active(item, this.alt) }} + {% endfor %} </div> </div> <div class="container py-3"> @@ -38,26 +15,12 @@ </div> <div class="container py-3"> <div class="row"> - <div class="col-5"> - <ul class="jobs-ul"> - <li>Executive Director</li> - <li>User Research Coordinator</li> - <li>Community Liaison</li> - <li>Core developer</li> - <li>Support assistants and translators</li> - <li>Browser hacker</li> - <li>Pluggable transport developer</li> - </ul> - </div> - <div class="col-5"> + <div class="col-85"> <ul class="jobs-ul"> - <li>Firefox/Thunderbird Extension Developer</li> - <li>Director of Communications</li> - <li>Executive Administrator</li> - <li>Browser Developers for Mobile (Android)</li> - <li>Chief Financial and Grants Officer</li> - <li>Android OS Developer</li> - <li>Fundraising Director</li> + {% set items = this.children %} + {% for item in items.filter(F.active == False) %} + <li>{{ item.title }}</li> + {% endfor %} </ul> </div> </div> diff --git a/templates/macros/jobs.html b/templates/macros/jobs.html new file mode 100644 index 0000000..f1ca470 --- /dev/null +++ b/templates/macros/jobs.html @@ -0,0 +1,16 @@ +{% macro render_active(item, alternative) %} +<div class="card border-0"> + <div class="card-header bg-white border-0" id="headingOne"> + <h5 class="mb-0"> + <button class="btn btn-link bg-white" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> + <a href="{{ item.path|url }}">{{ item.title }}</a> + </button> + </h5> + </div> + <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionJobs"> + <div class="card-body"> + {{ item.summary }} + </div> + </div> +</div> +{% endmacro %} diff --git a/templates/macros/people.html b/templates/macros/people.html index 08edada..5ebc2c8 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -1,5 +1,5 @@ {% macro render_board(item, alternative) %} - <div class="card p-3 m-3 border-0 col-5"> + <div class="card border-0 col-6"> <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.title }}</h6> @@ -10,7 +10,7 @@ {% endmacro %} {% macro render_core(item, alternative) %} - <div class="card m-3 border-0 border-bottom border-light col-3"> + <div class="card border-0 border-bottom border-light col-3"> <div class="card-body"> <h5 class="card-title human-name human-name-small">{{ item.name }}</h5> <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">{{ item.nickname }}{% if item.pronoun %} - {{ item.pronoun }}{% endif %}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6> diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html new file mode 100644 index 0000000..f5d53dd --- /dev/null +++ b/templates/macros/sponsors.html @@ -0,0 +1,9 @@ +{% macro render_active(item, alternative) %} +<div class="card border-0 col-6"> + <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap"> + <div class="card-body"> + <p class="text-primary description description-small"><u><a href="{{ item.link }}">{{ item.name }}</a></u></p> + <p class="card-text description description-small">{{ item.description }}</p> + </div> +</div> +{% endmacro %} diff --git a/templates/people.html b/templates/people.html index e4c07bc..7d0985a 100644 --- a/templates/people.html +++ b/templates/people.html @@ -1,7 +1,7 @@ <div class="container py-3"> <h3 class="text-primary display-5">Board of Directors</h3> </div> -<div class="container col-10"> +<div class="container"> <div class="row"> {% from "macros/people.html" import render_board %} {% set items = this.children %} @@ -13,7 +13,7 @@ <div class="container py-3"> <h3 class="text-primary display-5">Core Tor</h3> </div> -<div class="container col-10"> +<div class="container"> <div class="row"> {% from "macros/people.html" import render_core %} {% set items = this.children %} diff --git a/templates/sponsor.html b/templates/sponsor.html new file mode 100644 index 0000000..54b06a9 --- /dev/null +++ b/templates/sponsor.html @@ -0,0 +1 @@ +{{ this.name }} diff --git a/templates/sponsors.html b/templates/sponsors.html index 0ad9463..8bb08ba 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -1,126 +1,32 @@ <div class="container py-3"> <h3 class="text-primary display-5">Past Sponsors</h3> </div> -<div class="container col-10"> +<div class="container"> <div class="row"> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> + <div class="col-8"> + <ul class="jobs-ul"> + {% set items = this.children %} + {% for item in items.filter(F.active == False) %} + <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> + {% endfor %} + </ul> </div> </div> </div> <div class="container py-3"> <h3 class="text-primary display-5">Active Sponsors</h3> </div> -<div class="container col-10"> +<div class="container"> <div class="row"> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> - <div class="card m-3" style="width: 255px; height: 329px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <p class="text-primary description description-small"><u>Sponsor Name</u></p> - <p class="card-text description description-small">Some quick paragraph about the projects we are working with this sponsor and a link to the trac.</p> - </div> - </div> + {% from "macros/sponsors.html" import render_active %} + {% set items = this.children %} + {% for item in items.filter(F.active == True) %} + {{ render_active(item, this.alt) }} + {% endfor %} + </div> +</div> +<div class="container"> + <div class="row"> + <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our Financial Reports page.</p> </div> </div>

1 0

[tpo/staging] Remove temp files
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 5b6be9a8fc2ae6e039d8474a89f7cf8b15393cf3 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 16:06:49 2019 +0100 Remove temp files --- i18n/_compiled/en/LC_MESSAGES/contents.mo | Bin 1581 -> 0 bytes i18n/_compiled/es/LC_MESSAGES/contents.mo | Bin 363 -> 0 bytes i18n/_compiled/fr/LC_MESSAGES/contents.mo | Bin 362 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/i18n/_compiled/en/LC_MESSAGES/contents.mo b/i18n/_compiled/en/LC_MESSAGES/contents.mo deleted file mode 100644 index eee9bbd..0000000 Binary files a/i18n/_compiled/en/LC_MESSAGES/contents.mo and /dev/null differ diff --git a/i18n/_compiled/es/LC_MESSAGES/contents.mo b/i18n/_compiled/es/LC_MESSAGES/contents.mo deleted file mode 100644 index 6e84656..0000000 Binary files a/i18n/_compiled/es/LC_MESSAGES/contents.mo and /dev/null differ diff --git a/i18n/_compiled/fr/LC_MESSAGES/contents.mo b/i18n/_compiled/fr/LC_MESSAGES/contents.mo deleted file mode 100644 index e660b2d..0000000 Binary files a/i18n/_compiled/fr/LC_MESSAGES/contents.mo and /dev/null differ

1 0

[tpo/staging] Modify gitignore
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 52aa6b3a81dc1ee2641daa32cace9a303c8798a5 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 16:00:01 2019 +0100 Modify gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2baf5c4..e978b24 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,8 @@ node_modules .DS_Store public - +*.mo +*.po contents+*.lr *.egg-info

1 0

[tpo/staging] Merge branch 'staging'
by hiro＠torproject.org 17 Jan '19

17 Jan '19

1 0

[tpo/master] Remove temp files
by hiro＠torproject.org 17 Jan '19

17 Jan '19

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2019