[tor-commits] [tpo/master] Update .htaccess - fix typo
commit 10c7c2c47b144afb044ca237e3f972d81db433af Author: hiro Date: Fri Oct 25 22:08:02 2019 +0200 Update .htaccess - fix typo --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 8762a85..2e2 100644 --- a/.htaccess +++ b/.htaccess @@ -72,7 +72,7 @@ RewriteRule ^press/press(.*) /press [R=302,L] # Donation campaign # 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302, L] +RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] # other (feel free to categorize) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 06cd798815b8659cf70b65a1b9764ed402eda32c Author: hiro Date: Fri Oct 25 22:03:34 2019 +0200 Update htaccess --- .htaccess | 1 + lego | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 2655a40..8762a85 100644 --- a/.htaccess +++ b/.htaccess @@ -72,6 +72,7 @@ RewriteRule ^press/press(.*) /press [R=302,L] # Donation campaign # 2019 +RewriteRule ^donate(.*) https://donate.torproject.org [R=302, L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] # other (feel free to categorize) diff --git a/lego b/lego index 09c5813..37611e7 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit 37611e7cfae397d5e8a8aa41ac219a41ae2b6181 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update .htaccess again
commit 2629c4faafcaaabc2e43bf0cc0fd172110f6e6ee Author: hiro Date: Wed Jun 26 10:34:17 2019 +0200 Update .htaccess again --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index dcd3a42..3d43392 100644 --- a/.htaccess +++ b/.htaccess @@ -9,7 +9,7 @@ RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 RewriteRule ^about/jobs(.*).html.en$ /about/jobs [R=302,L] 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] +RewriteRule ^images/how_tor_works_thumb.png$ https://2019.www.torproject.org/images/how_tor_works_thumb.png [R=302,L] # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update .htaccess again
commit d0dd2320070f697208536a6556b398d0cd3a78a3 Author: hiro Date: Wed Jun 26 09:28:29 2019 +0200 Update .htaccess again --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 31e4457..dcd3a42 100644 --- a/.htaccess +++ b/.htaccess @@ -9,6 +9,7 @@ RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 RewriteRule ^about/jobs(.*).html.en$ /about/jobs [R=302,L] 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] # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update .htaccess
commit 5f181c49fe81a5e78884a0874011f381af79c655 Author: hiro Date: Wed Jun 26 08:52:12 2019 +0200 Update .htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index ed88f27..31e4457 100644 --- a/.htaccess +++ b/.htaccess @@ -5,6 +5,7 @@ RewriteRule ^about/corepeople.html.en$ /about/people/ [R=302,L] RewriteRule ^about/board.html.en$ /about/people/ [R=302,L] RewriteRule ^about/contributors.html.en$ /about/people/ [R=302,L] RewriteRule ^about/torusers(.*) https://2019.www.torproject.org/about/torusers$1 [R=302,L] +RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 [R=302,L] RewriteRule ^about/jobs(.*).html.en$ /about/jobs [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update .htaccess
commit bc37b7445ef057cc1f23646052353f3f38160f8a Author: hiro Date: Thu Mar 28 12:11:58 2019 +0100 Update .htaccess --- .htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 556b66e..9496428 100644 --- a/.htaccess +++ b/.htaccess @@ -20,7 +20,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/(.*) /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] @@ -33,10 +33,10 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] -RewriteRule ^projects/torbrowser/RecommendedTBBVersions ttps://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$ [R=302,L] RewriteRule ^projects/torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] -RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] +RewriteRule ^projects/(.*) https://2019.www.torproject.org/projects/projects$ [R=302,L] #Pluggable Transports RewriteRule ^PT/?$ https://2019.www.torproject.org/docs/pluggable-transports [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 2f1e2819904f578107da9fb158905cf0967f64a7 Author: hiro Date: Wed Mar 27 17:15:44 2019 +0100 Update htaccess --- .htaccess| 3 +++ templates/macros/people.html | 1 + 2 files changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index 2ff0d64..6987237 100644 --- a/.htaccess +++ b/.htaccess @@ -60,6 +60,9 @@ RewriteRule ^support(.*) https://support.torproject.org [R=301,L] # Newsletter RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] +# Press +RewriteRule ^press/press(.*) /press [R=302,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] diff --git a/templates/macros/people.html b/templates/macros/people.html index 22b0121..18e3285 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -18,6 +18,7 @@ {% if item.image %} + {% else %} {% endif %} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit b2f1c0d69cf225924e0694a31ee4899fd6b8497e Author: hiro Date: Wed Mar 27 16:15:05 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 9a2d6dc..2ff0d64 100644 --- a/.htaccess +++ b/.htaccess @@ -3,6 +3,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] +RewriteRule ^about/sponsors(.*) /about/sponsors$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 0d48b7f77d9c199140a2199542bd05053f5849de Author: hiro Date: Wed Mar 27 16:13:37 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 1f9e891..9a2d6dc 100644 --- a/.htaccess +++ b/.htaccess @@ -2,6 +2,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] +RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 0688808a33ed5daf20a919b142dbb80d2f0a3107 Author: hiro Date: Wed Mar 27 16:12:09 2019 +0100 Update htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3301643..1f9e891 100644 --- a/.htaccess +++ b/.htaccess @@ -73,7 +73,7 @@ RewriteRule ^download/download-easy(.*) /download [R=302,L] RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] # Index Pages -RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 [R=302,L] +RewriteRule ^about/overview(.*) /about/history$1 [R=302,L] RewriteRule ^about/$ /about/history [R=302,L] # Donation campaign ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 68f1a1643a6d07ca35736fdadb87453961cba1cf Author: hiro Date: Wed Mar 27 16:09:43 2019 +0100 Update htaccess --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 2d6528e..3301643 100644 --- a/.htaccess +++ b/.htaccess @@ -21,6 +21,7 @@ RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser [R=301,L] + # tordnsel RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L] @@ -29,6 +30,8 @@ RewriteRule ^overview(.*) /about/history$1 [R=301,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions ttps://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions [R=302,L] +RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] #Pluggable Transports ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 7186e56da51f716d20666409f0ee0816d69c2242 Author: hiro Date: Wed Mar 27 16:07:02 2019 +0100 Update htaccess --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 957f887..2d6528e 100644 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,8 @@ RewriteEngine On +# about +RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] + # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] RewriteRule ^docs/bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Update htaccess
commit 0b5305c93538d9aaba103bbdcf66b090eeb4d7a3 Author: hiro Date: Wed Mar 27 10:23:48 2019 +0100 Update htaccess --- .htaccess | 4 1 file changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index bdf2262..218680a 100644 --- a/.htaccess +++ b/.htaccess @@ -61,7 +61,11 @@ RewriteRule ^about/contact(.*) /contact$1 [R=301,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] RewriteRule ^download/easy-download(.*) /download [R=301,L] +<<< HEAD RewriteRule ^download/download-easy(.*) /download [R=302,L] +=== +RewriteRule ^download/download-easy(.*) /download [R=301,L] +>>> Update htaccess # Relays RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits