[tor-commits] [dev/staging] Merge request from Antonela
hiro at torproject.org
hiro at torproject.org
Tue Nov 24 17:59:15 UTC 2020
commit cf513d6c57fe48fd4badc372bfe753d3853671e8
Merge: 2ae4bca 6e64a76
Author: hiro <hiro at torproject.org>
Date: Tue Nov 24 18:59:01 2020 +0100
Merge request from Antonela
README.md | 46 +-
assets/static/files/tor-network-2019-b.odp | 13 -
assets/static/files/tor-network-2019.odp | Bin 244102 -> 0 bytes
assets/static/files/tor-network-2019.pdf | Bin 524047 -> 0 bytes
assets/static/files/tor-network-2019.pdf.lr | 13 -
.../static/files/tor-slides-full-deck-2019-b.odp | 13 -
.../static/files/tor-slides-full-deck-2019-b.pdf | 13 -
assets/static/files/tor-slides-full-deck-2019.odp | Bin 3569187 -> 0 bytes
assets/static/files/tor-slides-full-deck-2019.pdf | Bin 2344713 -> 0 bytes
assets/static/images/album.jpg | Bin 64394 -> 0 bytes
assets/static/images/blog.jpg | Bin 122280 -> 0 bytes
assets/static/images/bridges.png | Bin 221675 -> 0 bytes
assets/static/images/carousel.jpg | Bin 82270 -> 0 bytes
assets/static/images/circuit_full.png | Bin 83174 -> 0 bytes
assets/static/images/configure.png | Bin 245540 -> 0 bytes
assets/static/images/connect.png | Bin 74848 -> 0 bytes
assets/static/images/cover.jpg | Bin 36580 -> 0 bytes
assets/static/images/dashboard.jpg | Bin 105325 -> 0 bytes
assets/static/images/google-play-badge.png | Bin 13957 -> 0 bytes
assets/static/images/gray-image.png | Bin 1530 -> 0 bytes
assets/static/images/grid.jpg | Bin 99951 -> 0 bytes
assets/static/images/home/png/localization.png | Bin 127884 -> 0 bytes
assets/static/images/home/png/onion-services.png | Bin 121154 -> 0 bytes
assets/static/images/home/png/outreach.png | Bin 82148 -> 0 bytes
assets/static/images/home/png/relay-operations.png | Bin 131576 -> 0 bytes
assets/static/images/home/png/training.png | Bin 115177 -> 0 bytes
assets/static/images/home/png/user-research.png | Bin 95124 -> 0 bytes
assets/static/images/home/svg/localization.svg | 1 -
assets/static/images/home/svg/onion-services.svg | 1 -
assets/static/images/home/svg/outreach.svg | 1 -
assets/static/images/home/svg/relay-operations.svg | 1 -
assets/static/images/home/svg/training.svg | 1 -
assets/static/images/home/svg/user-research.svg | 1 -
assets/static/images/how-tor-works.png | Bin 87622 -> 0 bytes
assets/static/images/https.png | Bin 91006 -> 0 bytes
assets/static/images/image1.png | Bin 247682 -> 0 bytes
assets/static/images/image2.png | Bin 895331 -> 0 bytes
assets/static/images/image3.png | Bin 34917 -> 0 bytes
assets/static/images/image4.png | Bin 62407 -> 0 bytes
assets/static/images/image5.png | Bin 50445 -> 0 bytes
assets/static/images/image6.png | Bin 127634 -> 0 bytes
assets/static/images/jumbotron-narrow.jpg | Bin 68573 -> 0 bytes
assets/static/images/jumbotron.png | Bin 101076 -> 0 bytes
assets/static/images/justified-nav.jpg | Bin 79037 -> 0 bytes
assets/static/images/localization/stats.png | Bin 297298 -> 0 bytes
assets/static/images/localization/tr1.png | Bin 13899 -> 0 bytes
assets/static/images/localization/tr2.png | Bin 18398 -> 0 bytes
assets/static/images/localization/tr3.png | Bin 14394 -> 0 bytes
assets/static/images/localization/tr4.png | Bin 14928 -> 0 bytes
assets/static/images/localization/tr5.png | Bin 7067 -> 0 bytes
assets/static/images/menu-new-identity.png | Bin 32282 -> 0 bytes
assets/static/images/navbar-bottom.jpg | Bin 27921 -> 0 bytes
assets/static/images/navbar-fixed.jpg | Bin 37932 -> 0 bytes
assets/static/images/navbar-static.jpg | Bin 39654 -> 0 bytes
assets/static/images/navbar.jpg | Bin 40956 -> 0 bytes
assets/static/images/new-circuit-display.png | Bin 45717 -> 0 bytes
assets/static/images/new_identity.png | Bin 1542492 -> 0 bytes
assets/static/images/nodes.png | Bin 388258 -> 0 bytes
assets/static/images/noscript_menu.png | Bin 624085 -> 0 bytes
assets/static/images/offcanvas.jpg | Bin 112527 -> 0 bytes
.../overview/tor-onion-services-1.png | Bin 17222 -> 0 bytes
.../overview/tor-onion-services-2.png | Bin 19207 -> 0 bytes
.../overview/tor-onion-services-3.png | Bin 22213 -> 0 bytes
.../overview/tor-onion-services-4.png | Bin 21419 -> 0 bytes
.../overview/tor-onion-services-5.png | Bin 22165 -> 0 bytes
.../overview/tor-onion-services-6.png | Bin 18018 -> 0 bytes
assets/static/images/onion-website.png | Bin 4576 -> 0 bytes
assets/static/images/onions/png/nytimes.png | Bin 36728 -> 0 bytes
assets/static/images/onions/png/propublica.png | Bin 23196 -> 0 bytes
assets/static/images/onions/png/tor.png | Bin 4830 -> 0 bytes
assets/static/images/onions/svg/nytimes.svg | 1 -
assets/static/images/onions/svg/propublica.svg | 1 -
assets/static/images/onions/svg/tor.svg | 76 ---
assets/static/images/padlock-onion.png | Bin 7050 -> 0 bytes
assets/static/images/proxy.png | Bin 91762 -> 0 bytes
assets/static/images/proxy_question.png | Bin 30252 -> 0 bytes
assets/static/images/sign-in.jpg | Bin 13596 -> 0 bytes
assets/static/images/slider.png | Bin 194788 -> 0 bytes
assets/static/images/slider_window.png | Bin 6169 -> 0 bytes
assets/static/images/sponsors/OTF.jpg | Bin 22698 -> 0 bytes
assets/static/images/sponsors/OTF.png | Bin 18657 -> 0 bytes
assets/static/images/sponsors/USSD.png | Bin 90079 -> 0 bytes
assets/static/images/sponsors/artwork.png | Bin 22387 -> 0 bytes
assets/static/images/sponsors/artwork at 2x.png | Bin 46793 -> 0 bytes
assets/static/images/sponsors/cymru.png | Bin 16385 -> 0 bytes
assets/static/images/sponsors/darpa.png | Bin 147898 -> 0 bytes
assets/static/images/sponsors/fastly.png | Bin 10142 -> 0 bytes
assets/static/images/sponsors/fastly.svg | 1 -
assets/static/images/sponsors/handshake.png | Bin 11209 -> 0 bytes
assets/static/images/sponsors/handshake.svg | 13 -
assets/static/images/sponsors/imls.png | Bin 36164 -> 0 bytes
assets/static/images/sponsors/mdf.jpg | Bin 11032 -> 0 bytes
assets/static/images/sponsors/mdf.png | Bin 29004 -> 0 bytes
assets/static/images/sponsors/mozilla.jpg | Bin 15093 -> 0 bytes
assets/static/images/sponsors/mozilla.png | Bin 16327 -> 0 bytes
assets/static/images/sponsors/nsf-georgetown.png | Bin 89533 -> 0 bytes
assets/static/images/sponsors/nsf-minnesota.png | Bin 83004 -> 0 bytes
assets/static/images/sponsors/nsf-rit.png | Bin 76449 -> 0 bytes
assets/static/images/sponsors/nsf.png | Bin 63745 -> 0 bytes
assets/static/images/sponsors/rose.png | Bin 42626 -> 0 bytes
assets/static/images/sponsors/sida.png | Bin 38963 -> 0 bytes
assets/static/images/starter-template.jpg | Bin 22571 -> 0 bytes
assets/static/images/sticky-footer-navbar.jpg | Bin 39249 -> 0 bytes
assets/static/images/sticky-footer.jpg | Bin 25002 -> 0 bytes
assets/static/images/tb85/tb85.png | Bin 46123 -> 0 bytes
assets/static/images/tb85/tb85 at 2x.png | Bin 107230 -> 0 bytes
assets/static/images/tor-and-https.svg | 690 ---------------------
.../png/TBAa-onboarding.png | Bin 58890 -> 0 bytes
.../png/TBAa-onboarding at 2x.png | Bin 159182 -> 0 bytes
.../svg/TBAa-onboarding at 3x.svg | 9 -
.../tor-browser/Browser_Horizontal_Color.png | Bin 6199 -> 0 bytes
.../tor-browser/Browser_Horizontal_Color.svg | 139 -----
assets/static/images/tor-browser/Browser_Icon.png | Bin 5309 -> 0 bytes
assets/static/images/tor-browser/Browser_Icon.svg | 70 ---
.../images/tor-browser/Browser_Vertical_Color.png | Bin 6301 -> 0 bytes
.../images/tor-browser/Browser_Vertical_Color.svg | 135 ----
.../images/tor-download/Download_Big_Green.png | Bin 5965 -> 0 bytes
.../images/tor-download/Download_Big_Green.svg | 107 ----
.../images/tor-download/Download_Big_Purple.png | Bin 5949 -> 0 bytes
.../images/tor-download/Download_Big_Purple.svg | 106 ----
.../images/tor-download/Download_Medium_Green.png | Bin 3448 -> 0 bytes
.../images/tor-download/Download_Medium_Green.svg | 59 --
.../images/tor-download/Download_Medium_Purple.png | Bin 3440 -> 0 bytes
.../images/tor-download/Download_Medium_Purple.svg | 59 --
.../images/tor-download/Download_Small_Green.png | Bin 1905 -> 0 bytes
.../images/tor-download/Download_Small_Green.svg | 34 -
.../images/tor-download/Download_Small_Purple.png | Bin 1895 -> 0 bytes
.../images/tor-download/Download_Small_Purple.svg | 34 -
.../static/images/tor-launcher-custom-bridges.png | Bin 92502 -> 0 bytes
.../static/images/tor-support/Support_Big_Gray.png | Bin 3496 -> 0 bytes
.../static/images/tor-support/Support_Big_Gray.svg | 77 ---
.../images/tor-support/Support_Big_Green.png | Bin 3472 -> 0 bytes
.../images/tor-support/Support_Big_Green.svg | 77 ---
.../images/tor-support/Support_Big_Purple.png | Bin 3510 -> 0 bytes
.../images/tor-support/Support_Big_Purple.svg | 111 ----
.../images/tor-support/Support_Small_Gray.png | Bin 1990 -> 0 bytes
.../images/tor-support/Support_Small_Gray.svg | 34 -
.../images/tor-support/Support_Small_Green.png | Bin 2013 -> 0 bytes
.../images/tor-support/Support_Small_Green.svg | 34 -
.../images/tor-support/Support_Small_Purple.png | Bin 2013 -> 0 bytes
.../images/tor-support/Support_Small_Purple.svg | 34 -
assets/static/images/tr1.png | Bin 13899 -> 0 bytes
assets/static/images/tr2.png | Bin 18398 -> 0 bytes
assets/static/images/tr3.png | Bin 14394 -> 0 bytes
assets/static/images/tr4.png | Bin 14928 -> 0 bytes
assets/static/images/tr5.png | Bin 7067 -> 0 bytes
assets/static/images/update-tb.png | Bin 12557 -> 0 bytes
assets/static/images/windows-logo/png/Shape.png | Bin 339 -> 0 bytes
assets/static/images/windows-logo/png/Shape at 2x.png | Bin 633 -> 0 bytes
assets/static/images/windows-logo/svg/Shape.svg | 18 -
content/contents.lr | 11 +-
content/fighting-censorship/bridges/contents.lr | 19 +
content/fighting-censorship/contents.lr | 19 +
content/fighting-censorship/get-tor/contents.lr | 19 +
content/fighting-censorship/ooni/contents.lr | 19 +
.../pluggable-transports/contents.lr | 19 +
content/hacking-on-tor/contents.lr | 19 +
content/hacking-on-tor/hacking-tor/contents.lr | 19 +
content/hacking-on-tor/research/contents.lr | 19 +
.../writing-documentation/contents.lr | 19 +
content/manage-tor/contents.lr | 19 +
content/manage-tor/nyx/contents.lr | 19 +
content/manage-tor/onion-balance/contents.lr | 19 +
content/observing-tor/contents.lr | 19 +
content/observing-tor/exitscanner/contents.lr | 19 +
content/observing-tor/metrics/contents.lr | 19 +
content/observing-tor/sbws/contents.lr | 19 +
content/tor-ecosystem/contents.lr | 22 +-
content/tor-ecosystem/onionshare/contents.lr | 19 +
content/tor-ecosystem/tor-browser/contents.lr | 19 +
.../tor-browser/tor-browser-android/contents.lr | 19 +
.../tor-browser/tor-browser/contents.lr | 19 +
content/tor-network/contents.lr | 19 +
content/tor-network/dev-tools/contents.lr | 23 +
content/tor-network/tor-design/contents.lr | 19 +
content/tor-network/tor-protocol/contents.lr | 19 +
content/tor-network/tor/contents.lr | 19 +
content/understanding-tor/contents.lr | 19 +
databags/onions.ini | 14 -
lego | 2 +-
models/project.ini | 17 +
models/resource.ini | 32 -
models/resources.ini | 34 -
templates/home.html | 10 +
templates/homepage.html | 26 -
templates/localization.html | 35 --
templates/onion-services.html | 68 --
templates/outreach.html | 41 --
templates/project.html | 57 ++
templates/relay-operations.html | 29 -
templates/resource.html | 1 -
templates/resources.html | 29 -
templates/section.html | 30 +
templates/training.html | 35 --
templates/user-research.html | 34 -
195 files changed, 659 insertions(+), 2389 deletions(-)
diff --cc content/tor-ecosystem/contents.lr
index 489ce1a,eb5b9d1..e7e6f17
--- a/content/tor-ecosystem/contents.lr
+++ b/content/tor-ecosystem/contents.lr
@@@ -1,17 -1,19 +1,37 @@@
++<<<<<<< HEAD
+section: tor-ecosystem
++=======
+ section: tor ecosystem
++>>>>>>> anto/master
---
section_id: tor-ecosystem
---
color: primary
---
++<<<<<<< HEAD
+_template: layout.html
+---
+title: Tor Ecosystem
+---
+subtitle: Here are some other organisations and teams that form part of the wider Tor Ecosystem
+---
+key: 6
+---
+html: training.html
+---
- body:
++body:
++=======
+ key: 6
+ ---
+ html: section.html
+ ---
+ cta: Call To Action
+ ---
+ title: The Tor Ecosystem
+ ---
+ subtitle: Applications that use tor: Ones we maintain, like Tor Browser, and selected others that we love
+ ---
+ body:
+
+ the overview
++>>>>>>> anto/master
diff --cc lego
index 7f2289b,7bb98ba..b9b8de1
--- a/lego
+++ b/lego
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3
-Subproject commit 7bb98ba753539250d3346ad559f0279b76dfb0fb
++Subproject commit b9b8de108ed6e4d2e7f9f175d08a40ee3fab49c1
diff --cc models/project.ini
index d0167ff,6d5f780..d9bd3f1
--- a/models/project.ini
+++ b/models/project.ini
@@@ -10,8 -10,8 +10,13 @@@ type = strin
label = Link
type = url
++<<<<<<< HEAD
+[fields.maintained]
+label = Maintained
++=======
+ [fields.active]
+ label = Active
++>>>>>>> anto/master
type = boolean
[fields.subtitle]
@@@ -26,14 -26,18 +31,26 @@@ type = strin
label = body
type = markdown
++<<<<<<< HEAD
+[fields.maintainers]
+label = Maintainers
++=======
+ [fields.mentors]
+ label = Mentors
++>>>>>>> anto/master
type = strings
[fields.languages]
label = Languages
type = strings
++<<<<<<< HEAD
++=======
+ [fields.difficulty]
+ label = Difficulty Level
+ type = string
+
++>>>>>>> anto/master
[fields.html]
label = Html
type = string
diff --cc templates/home.html
index a63f9ad,082fe5c..1dd9032
--- a/templates/home.html
+++ b/templates/home.html
@@@ -19,25 -22,16 +19,35 @@@
</div>
{% endfor %}
</div>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Research') }}</h2>
+ <p class="text-center">
+ {{ _('Many people around the world are doing research on how to improve the Tor design, what\'s going on in the Tor network, and more generally on attacks and defenses for anonymous communication systems. Our research portal holds the resources we provide to help make your Tor research more effective.')}}
+ </p>
+ <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://research.torproject.org">
+ {{ _('Research Portal') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ </a>
+ </div>
+ </div>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Project Ideas') }}</h2>
+ <p class="text-center">
+ {{ _('Here you will find some projects that may be good ideas for Outreachy, Google Summer of Code or other internship programs we may participate in in future.')}}
+ </p>
+ <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="/project-ideas">
+ {{ _('Learn More') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ </a>
+ </div>
</div>
</section>
+ <section>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto">{{ _('Become a Tor Developer') }}</h2>
+ <p class="text-center">
+ {{ _('Some guidelines here about how to join gitlab and a link to good first issue') }}</p>
+ <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="#">
+ {{ _('Go to the link') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ </a>
+ </div>
+ </section>
</div>
More information about the tor-commits
mailing list