merge of '12d7b8d68369ddc3b14dab27336e830db3c6d54d'

and '849888b2716fc85512b1081c070d05eeca7ca4f5'
This commit is contained in:
duck
2011-01-01 15:17:05 +00:00
3 changed files with 16 additions and 8 deletions

View File

@ -2,8 +2,8 @@
{% block title %}halloffame{% endblock %}
{% block content %}
<h1>I2P'<font size=-1>s</font> Hall of Fame</h1>
<b>Current balance: as of 2010-11-10</b><br />
<b>General fund: 912,19 &euro; and $270 USD</b><br />
<b>Current balance: as of 2010-12-25</b><br />
<b>General fund: 823,69 &euro; and $280 USD</b><br />
<b><a href="bounty_datastore">Datastorage bounty</a>: 700.0 &euro;</b><br />
<b><a href="bounty_ipv6"></a>native IPv6 I2P: 50.0 &euro;</b><br />
<b><a href="bounty_i2phex">I2PHex bounty</a>: 60.0 &euro;</b><br />
@ -18,12 +18,16 @@
<b>Current monthly subscriptions:</b><br />
<table border="1">
<tr><td>07/2010-07/2011</td><td>anonymous</td><td>20 &euro;</td><td>General fund</td></tr>
<tr><td>02/2010-02/2011</td><td>anonymous</td><td>10 &euro;</td><td>General fund</td></tr>
</table>
<br />
<b>Previous donations:</b><br />
<table border="1">
<tr><td>Dec, 2010</td><td>anonymous</td><td>$10 USD</td><td>General fund</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>20 &euro;</td><td>General fund</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>1.50 &euro;</td><td>General fund</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>10 &euro;</td><td>General fund</td></tr>
<tr><td>Nov, 2010</td><td>anonymous</td><td>20 &euro;</td><td>General fund</td></tr>
<tr><td>Oct, 2010</td><td>anonymous</td><td>20 &euro;</td><td>General fund</td></tr>
<tr><td>Oct, 2010</td><td>anonymous</td><td>15 &euro;</td><td>General fund</td></tr>
<tr><td>Oct, 2010</td><td>ru bounty payback</td><td>$230 USD</td><td>General fund</td></tr>

View File

@ -2,8 +2,8 @@
{% block title %}Ruhmeshalle{% endblock %}
{% block content %}
<h1>I2P'<font size=-1>s</font> Ruhmeshalle</h1>
<b>Derzeitiger Stand zum 10.11.2010:</b><br />
<b>Generelles Konto: 912,19 &euro; und $270 USD</b><br />
<b>Derzeitiger Stand zum 25.12.2010:</b><br />
<b>Generelles Konto: 823,69 &euro; und $280 USD</b><br />
<b><a href="bounty_datastore_de">Datencontainer Belohnung</a>: 700.0 &euro;</b><br />
<b><a href="bounty_ipv6_de.html">native IPv6-I2P </a>: 50.0 &euro;</b><br />
<b><a href="bounty_i2phex_de.html">I2PHex Code Belohnung</a>: 60.0 &euro;</b><br />
@ -26,12 +26,16 @@ gespendet haben!</p>
<b>Derzeitige monatliche Spenden:</b><br />
<table border="1">
<tr><td>07/2010-07/2011</td><td>anonymous</td><td>20 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>02/2010-02/2011</td><td>anonymous</td><td>10 &euro;</td><td>Generelles Konto</td></tr>
</table>
<br />
<b>Bisherige Spenden:</b><br />
<table border="1">
<tr><td>Dec, 2010</td><td>anonymous</td><td>$10 USD</td><td>Generelles Konto</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>20 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>1,50 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Dec, 2010</td><td>anonymous</td><td>10 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Nov, 2010</td><td>anonymous</td><td>20 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Oct, 2010</td><td>anonymous</td><td>20 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Oct, 2010</td><td>anonymous</td><td>15 &euro;</td><td>Generelles Konto</td></tr>
<tr><td>Oct, 2010</td><td>ru bounty R&uuml;ckzahlung</td><td>$230 USD</td><td>Generelles Konto</td></tr>

View File

@ -7,7 +7,7 @@ There are also optimizations to reduce memory usage in i2psnark.
The HTTP and SOCKS proxies now support local and remote authorization.
Upgrading is recommended.
</p><p>
I2P will be at 27C3 in Berlin the week of the December 27th.
I2P will be at 27C3 in Berlin the week of December 27th.
Look for the I2P people there and ask for I2P stickers!
</p><p>
Please help grow the network.
@ -36,7 +36,7 @@ Please volunteer on IRC #i2p.
<p>- Theme updates
<br />- Home page update
<br />- Covert GETs to POSTs for security
<br />- Convert GETs to POSTs for security
<br />- &quot;.jsp&quot; suffixes no longer required in URLs
<br />- Fix UDP rate display on Peers page
<br />- Stats page improvements