commit e7d78c770da01e552f9ed4d92e1d16ace1dc1b7b Merge: cee4340 70a1687 Author: Antonela <hola@antonela.me> Date: Fri Jan 11 10:51:58 2019 -0300 Merge pull request #1 from torproject/master rebase .gitignore | 5 +- assets/scss/_portal.scss | 13 +- assets/scss/_tor.scss | 16 + assets/scss/_tpo.scss | 30 +- assets/static/bootstrap.css | 22 +- assets/static/bootstrap.css.map | 2 +- assets/static/images/circle-pattern.png | Bin 0 -> 556240 bytes assets/static/images/circle-pattern.svg | 106 ++ assets/static/images/png/Group4.png | Bin 0 -> 12525 bytes assets/static/images/png/Group4@2x.png | Bin 0 -> 27750 bytes assets/static/images/png/Group4@3x.png | Bin 0 -> 43617 bytes assets/static/images/svg/Group 4.svg | 80 + content/about/contents+en.lr | 13 - content/about/contents+es.lr | 13 - content/about/contents+fr.lr | 13 - content/about/history/contents+en.lr | 31 - content/about/history/contents+es.lr | 31 - content/about/history/contents+fr.lr | 31 - content/about/jobs/contents+en.lr | 13 - content/about/jobs/contents+es.lr | 13 - content/about/jobs/contents+fr.lr | 13 - content/about/people/agrabeli/contents.lr | 16 + content/about/people/ahf/contents.lr | 15 + content/about/people/ailanthus/contents.lr | 13 + content/about/people/alsmith/contents.lr | 13 + content/about/people/amoghbl1/contents.lr | 13 + content/about/people/andreas/contents.lr | 12 + content/about/people/antonela/contents.lr | 13 + content/about/people/arlolra/contents.lr | 13 + content/about/people/arma/contents.lr | 14 + content/about/people/arthuredelstein/contents.lr | 11 + content/about/people/asn/contents.lr | 11 + content/about/people/atagar/contents.lr | 13 + content/about/people/bdavila/contents.lr | 13 + content/about/people/biella-core/contents.lr | 13 + content/about/people/biella/contents.lr | 23 + content/about/people/boklm/contents.lr | 11 + content/about/people/brade/contents.lr | 11 + content/about/people/catalyst/contents.lr | 16 + content/about/people/cindy-core/contents.lr | 15 + content/about/people/cindy/contents.lr | 23 + content/about/people/contents+en.lr | 13 - content/about/people/contents+es.lr | 13 - content/about/people/contents+fr.lr | 13 - content/about/people/contents.lr | 2 + content/about/people/dawuud/contents.lr | 14 + content/about/people/dgoulet/contents.lr | 11 + content/about/people/donnchac/contents.lr | 13 + content/about/people/egypcio/contents.lr | 13 + content/about/people/emmapeel/contents.lr | 13 + content/about/people/ewyatt/contents.lr | 12 + content/about/people/flexlibris/contents.lr | 17 + content/about/people/gaba/contents.lr | 13 + content/about/people/geko/contents.lr | 11 + content/about/people/ggus/contents.lr | 11 + content/about/people/gman999/contents.lr | 11 + content/about/people/gunner/contents.lr | 15 + content/about/people/haxxpop/contents.lr | 13 + content/about/people/hc/contents.lr | 14 + content/about/people/hellais/contents.lr | 15 + content/about/people/hiro/contents.lr | 13 + content/about/people/iangoldberg/contents.lr | 14 + content/about/people/igt0/contents.lr | 13 + content/about/people/inf0/contents.lr | 14 + content/about/people/intrigeri/contents.lr | 13 + content/about/people/irl/contents.lr | 16 + content/about/people/isabela/contents.lr | 13 + content/about/people/isra/contents.lr | 11 + content/about/people/jselon/contents.lr | 11 + content/about/people/juga/contents.lr | 13 + content/about/people/julius-core/contents.lr | 11 + content/about/people/julius/contents.lr | 19 + content/about/people/juris/contents.lr | 11 + content/about/people/karsten/contents.lr | 14 + content/about/people/kat/contents.lr | 13 + content/about/people/komlo/contents.lr | 13 + content/about/people/kushal/contents.lr | 17 + content/about/people/leif/contents.lr | 11 + content/about/people/ln5/contents.lr | 14 + content/about/people/matt-core/contents.lr | 14 + content/about/people/matt/contents.lr | 18 + content/about/people/mcs/contents.lr | 13 + content/about/people/meejah/contents.lr | 15 + content/about/people/megan/contents.lr | 23 + content/about/people/micahflee/contents.lr | 16 + content/about/people/moritz/contents.lr | 14 + content/about/people/mrphs/contents.lr | 14 + content/about/people/mtigas/contents.lr | 15 + content/about/people/n8fr8/contents.lr | 14 + content/about/people/nickm/contents.lr | 16 + content/about/people/nighat/contents.lr | 22 + content/about/people/nyinz/contents.lr | 12 + content/about/people/ohmygodel/contents.lr | 13 + content/about/people/pari/contents.lr | 14 + content/about/people/pastly/contents.lr | 11 + content/about/people/pepijn/contents.lr | 13 + content/about/people/peter/contents.lr | 11 + content/about/people/phoul/contents.lr | 14 + content/about/people/phw/contents.lr | 16 + content/about/people/pili/contents.lr | 15 + content/about/people/pospeselr/contents.lr | 13 + content/about/people/qbi/contents.lr | 13 + content/about/people/rabbi-rob-thomas/contents.lr | 11 + content/about/people/ramy-core/contents.lr | 13 + content/about/people/ramy/contents.lr | 29 + content/about/people/redshiftzero/contents.lr | 14 + content/about/people/robgjansen/contents.lr | 15 + content/about/people/saint/contents.lr | 15 + content/about/people/sajolida/contents.lr | 11 + content/about/people/sebastian/contents.lr | 12 + content/about/people/sisbell/contents.lr | 15 + content/about/people/sjmurdoch/contents.lr | 17 + content/about/people/ssteele/contents.lr | 15 + content/about/people/sstevenson/contents.lr | 13 + content/about/people/stephw/contents.lr | 15 + content/about/people/sukhe/contents.lr | 13 + content/about/people/sysrqb/contents.lr | 13 + content/about/people/syverson/contents.lr | 12 + content/about/people/t0mmy/contents.lr | 13 + content/about/people/teor/contents.lr | 14 + content/about/people/tjr/contents.lr | 16 + content/about/people/wayward/contents.lr | 15 + content/about/people/wseltzer/contents.lr | 14 + content/about/people/yawningangel/contents.lr | 11 + content/about/reports/contents+en.lr | 13 - content/about/reports/contents+es.lr | 13 - content/about/reports/contents+fr.lr | 13 - content/about/sponsors/contents+en.lr | 13 - content/about/sponsors/contents+es.lr | 13 - content/about/sponsors/contents+fr.lr | 13 - content/contact/contents+en.lr | 15 - content/contact/contents+es.lr | 15 - content/contact/contents+fr.lr | 15 - content/contents+en.lr | 14 - content/contents+es.lr | 14 - content/contents+fr.lr | 14 - content/contents.lr | 2 + content/download/contents.lr | 11 + content/press/contents+en.lr | 13 - content/press/contents+es.lr | 13 - content/press/contents+fr.lr | 13 - databags/about+en.ini | 10 +- databags/platforms+en.ini | 23 + databags/platforms+es.ini | 19 + databags/platforms+fr.ini | 19 + i18n/.gitignore | 2 + i18n/contents+en.po | 78 - i18n/contents+es.po | 1894 --------------------- i18n/contents+fr.po | 425 ----- i18n/contents.pot | 19 +- models/people.ini | 28 + models/person.ini | 37 + templates/download.html | 37 + templates/footer.html | 22 +- templates/header.html | 4 +- templates/hero-download.html | 38 + templates/hero-home.html | 15 + templates/hero.html | 15 +- templates/home.html | 115 +- templates/homepage.html | 33 + templates/ilos.html | 92 - templates/jumbotron.html | 2 +- templates/macros/people.html | 20 + templates/navbar.html | 15 +- templates/pagenav.html | 14 +- templates/people.html | 157 +- templates/person.html | 1 + 167 files changed, 2078 insertions(+), 3146 deletions(-)