Commit 45325bd0 authored by Antonela's avatar Antonela 🔮
Browse files

Merge branch 'master' into 'master'

Master

See merge request antonela/tpo!1
parents 8b6151b5 f4bad6a2
# These are supported funding model platforms
custom: ['https://donate.torproject.org']
......@@ -11,6 +11,11 @@ RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L]
RewriteRule ^about(.*).html.en$ /about$1 [R=302,L]
RewriteRule ^images/how_tor_works_thumb.png$ https://2019.www.torproject.org/images/how_tor_works_thumb.png [R=302,L]
# links from wikipedia
RewriteRule ^about/findoc(.*) /static/findoc$1 [R=302,L]
RewriteRule ^about/corepeople$ /about/people/ [R=302,L]
# moved to /docs/
RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L]
RewriteRule ^documentation.html$ https://2019.www.torproject.org/docs/documentation.html [R=302,L]
......@@ -20,7 +25,7 @@ RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton
RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L]
# Tor Browser
RewriteRule ^torbrowser/dist/(.*) https://2019.www.torproject.org//dist/torbrowser/$1 [R=302,L]
RewriteRule ^torbrowser/dist/(.*) https://2019.www.torproject.org/dist/torbrowser/$1 [R=302,L]
RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L]
RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L]
......@@ -44,7 +49,7 @@ RewriteRule ^projects/obfsproxy-instructions(.*) https://2019.www.torproject.org
RewriteRule ^projects/obfsproxy(.*) https://2019.www.torproject.org/docs/pluggable-transports [R=302,L]
#Relays
RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=302,L]
RewriteRule ^relay-guide(.*) https://community.torproject.org/relay/ [R=302,L]
# GetInvolved
RewriteRule ^getinvolved/$ https://2019.www.torproject.org/getinvolved/volunteer [R=302,L]
......@@ -65,9 +70,12 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L]
# Press
RewriteRule ^press/press(.*) /press [R=302,L]
# Donation campaign
# 2019
RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L]
# other (feel free to categorize)
RewriteRule ^people(.*) /about/people$1 [R=302,L]
RewriteRule ^donate$ https://donate.torproject.org [R=302,L]
RewriteRule ^about/contact(.*) /contact$1 [R=302,L]
RewriteRule ^contact.html$ /contact/ [R=302,L]
......@@ -80,7 +88,7 @@ RewriteRule ^download/easy-download(.*) /download [R=302,L]
RewriteRule ^download/download-easy(.*) /download [R=302,L]
# Relays
RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=302,L]
RewriteRule ^relays(.*) https://community.torproject.org/relay/ [R=302,L]
# Index Pages
RewriteRule ^about/overview.html(.*) /about/history [R=302,L]
......@@ -92,6 +100,7 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L]
# Videos
RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L]
# Donation campaign
# 2017
# Special-case the donate-options and amazon page so it doesn't get redirected
......
# Tor Project Website
This is the repository of Tor Project website. The current online version of this portal can be found at [https://torproject.org](https://torproject.org) or [Tor Project Onion Service](http://expyuzz4wqqyqhjn.onion/).
To clone the code use either of
```git clone https://git.torproject.org/project/web/tpo.git/```
```torify git clone http://dccbbv6cooddgcrq.onion/project/web/tpo.git/```
or browse it [online](http://gitweb.torproject.org/project/web/tpo.git).
## How to report bugs or feedback
First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/tpo/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Website.
## What is Lektor
[Lektor](https://www.getlektor.com/) is a framework to generate and serve websites from Markdown files.
Its code can be found at [GitHub](https://github.com/lektor/lektor).
## How to contribute
### (Easy) Edit this page button
You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/community/pulls).
### (Advanced) Compiling a local version of the website
1. Download and install Lektor: https://www.getlektor.com/downloads/
2. Install the lektor-i18n plugin and its [dependencies](https://github.com/numericube/lektor-i18n-plugin#prerequisites).
3. Clone the repository:
```git clone https://git.torproject.org/project/web/tpo.git```
4. Init the building blocks submodule:
```$ cd lego && git submodule update --init --recursive```
5. Translations for the website are imported by Jenkins when bulding the page, but if you want to test them, download the correct branch of the translations repo to the ./i18n/ folder.
6. Finally
To run a local continuous builder: ```$ lektor server```
To just build the website once: ```$ lektor build -O <folder>```
#### How to develop on the website
Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the-website).
### Translations
To help us to translate, please join the Tor Project team in [Transifex](https://www.transifex.com/).
### Getting help
If you want to contribute to the Tor Project website, we will be happy to help you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net).
../lego/assests/javascript
\ No newline at end of file
../lego/assets/javascript
\ No newline at end of file
../lego/assests/scss
\ No newline at end of file
../lego/assets/scss
\ No newline at end of file
../../lego/assests/static/css
\ No newline at end of file
../../lego/assets/static/css
\ No newline at end of file
../../lego/assests/static/fonts
\ No newline at end of file
../../lego/assets/static/fonts
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment