- tor-commits - lists.torproject.org

[webwml/master] landing page for alison
by nickm＠torproject.org 28 Dec '15

28 Dec '15

commit aad289abd330e4d24367a81b4b8b5be0bb5700b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 28 13:00:14 2015 -0500 landing page for alison --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 135805b..930e802 100644 --- a/.htaccess +++ b/.htaccess @@ -66,6 +66,7 @@ RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-alison.wml b/donate/en/donate-blog-alison.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/master] that was silly
by sebastian＠torproject.org 28 Dec '15

28 Dec '15

commit f28a4d059d9c365cf1b57ce5130c8ed157eb6707 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 28 10:22:29 2015 +0100 that was silly --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 13e7c83..7f0bfe7 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -53,7 +53,7 @@ docs/documentation>#MailingLists">mailing lists</a>, you must subscribe before you can post.</li> <li><i>donations(a)torproject.org</i> is for questions and comments about <a - href="<page donate/donate-1>">getting money to the developers</a>. More + href="<page donate/donate>">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li>

1 0

[webwml/master] add stretch to debian download page
by sebastian＠torproject.org 28 Dec '15

28 Dec '15

commit b30c3353140b7f6c51cc3742847829b9480195e2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 28 10:06:01 2015 +0100 add stretch to debian download page --- about/en/contact.wml | 2 +- docs/en/debian.wml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 7f0bfe7..13e7c83 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -53,7 +53,7 @@ docs/documentation>#MailingLists">mailing lists</a>, you must subscribe before you can post.</li> <li><i>donations(a)torproject.org</i> is for questions and comments about <a - href="<page donate/donate>">getting money to the developers</a>. More + href="<page donate/donate-1>">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li> diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 575a2b6..e1e7bcc 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -14,6 +14,7 @@ var software = { 'tor': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], + 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], 'precise': [ 'precise'], @@ -22,6 +23,7 @@ var software = { 'utopic': [ 'utopic'] }, 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], + 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], 'precise': [ 'precise'], @@ -32,6 +34,7 @@ var software = { 'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], + 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], 'precise': [ 'precise'], @@ -40,6 +43,7 @@ var software = { 'utopic': [ 'utopic'] }, 'experimental-0.2.7.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], + 'stretch': [ 'stretch' ], 'sid': [ 'sid' ], 'lucid': [ 'lucid'], 'precise': [ 'precise'],

1 0

[metrics-lib/master] Bump version to 1.1.0-dev.
by karsten＠torproject.org 28 Dec '15

28 Dec '15

commit 8767f3e3bb8f6c9aa8cdb4c9fb0e9f2b545a7501 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 28 09:30:58 2015 +0100 Bump version to 1.1.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 85918a7..f7ef7ca 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="jar" name="descriptor" basedir="."> - <property name="release.version" value="1.1.0" /> + <property name="release.version" value="1.1.0-dev" /> <property name="sources" value="src"/> <property name="classes" value="classes"/> <property name="tests" value="test"/>

1 0

[metrics-lib/master] Prepare for 1.1.0 release.
by karsten＠torproject.org 28 Dec '15

28 Dec '15

commit d5f89d1eb73849bd48d627f52e28d0b2e2c25861 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 28 09:19:39 2015 +0100 Prepare for 1.1.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb49133..4daab24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.x.x - 201x-xx-xx +# Changes in version 1.1.0 - 2015-12-28 * Medium changes - Parse flag thresholds in bridge network statuses, and parse the diff --git a/build.xml b/build.xml index a6e0ac0..85918a7 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ <project default="jar" name="descriptor" basedir="."> - <property name="release.version" value="1.0.0-dev" /> + <property name="release.version" value="1.1.0" /> <property name="sources" value="src"/> <property name="classes" value="classes"/> <property name="tests" value="test"/>

1 0

[webwml/master] another champion, another rewrite. I hope I am doing this right.
by nickm＠torproject.org 26 Dec '15

26 Dec '15

commit 2c08fe1626f9f39004108f9abf34cced19d1a219 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 26 15:17:14 2015 -0500 another champion, another rewrite. I hope I am doing this right. --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 15c6cc0..135805b 100644 --- a/.htaccess +++ b/.htaccess @@ -65,6 +65,7 @@ RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-ellsberg.wml b/donate/en/donate-blog-ellsberg.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] get rid of the 'get-intouch' section on donate page
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit a01d1bcb53f2f094c267a70ab126404a70f4cca5 Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Dec 26 06:39:34 2015 +0000 get rid of the 'get-intouch' section on donate page --- donate/en/donate.wml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index dc6081b..28ab1da 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -281,20 +281,6 @@ </div>  </div> - - <div class="get-in-touch"> - <div class="container"> - <div class="row"> - <div class="col-sm-4"> - <h3 class="title"><strong>Get in touch.</strong></h3> - </div> - <div class="col-sm-8"> - <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> - </div> - </div> - </div> - </div> - </div>

1 0

[webwml/staging] Some corrections on donate page css
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 06be3b32c3283d657bca6f7d4e064fc744f776eb Author: Nima Fatemi <nima(a)torproject.org> Date: Sat Dec 26 06:41:48 2015 +0000 Some corrections on donate page css - remove other ways to donate background - remove borders around icons --- css/donate-style.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index cb6908e..8dfbcc2 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -247,9 +247,6 @@ blockquote footer{ #other-ways-section > .container-fluid{ padding: 0; } -.main-other-ways{ - background-color: #f5f5f5; -} .hundred.toptwenty{ text-align: justify; margin-top: 0; @@ -272,6 +269,7 @@ blockquote footer{ background: transparent; margin-top: -10px; margin-right: 5px; + border:0; } .bitcoin{ padding-top: 10px; @@ -477,4 +475,4 @@ footer.footer{ font-size: 12px; } -} \ No newline at end of file +}

1 0

[webwml/staging] fix other ways to donate link functionality
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 7d62660e6672a51e6dffe58130696dea2f169a85 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 13:21:35 2015 +0800 fix other ways to donate link functionality scroll down the page to other ways donate section if click on other ways to donate link --- donate/en/donate.wml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 06d8289..490f1a3 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -91,7 +91,7 @@ <h5 class="error-msg">The minimum donation amount is $5</h5> <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button> <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> + <h4><a id="link" href="#other-ways-section">Other Ways to Donate</a></h4> </div>  @@ -370,6 +370,14 @@ $(".left").removeClass('active'); }); + + $("#link").on('click',function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $("#other-ways-section").offset().top + }, 200); + }); + });

1 0

[webwml/staging] set max-width for dwolla and amazon icons
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 9b8e3051b3c7bb9d796d80e3a4bab778b631d85d Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:36:25 2015 +0800 set max-width for dwolla and amazon icons --- css/donate-style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index d4fd12b..0f5fdfd 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -289,11 +289,9 @@ blockquote footer{ padding: 25px 0; background-color: #FAFAFA; } -.dsmall{ - padding: 0 8%; -} .other-ways-img{ width: 100%; + max-width: 160px; } .img-thumbnail.other-ways-img { padding: 1px;

1 0