From 846f6f219038f3d1293b51c9c4f4053440cbd9a0 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 18 Jul 2012 12:00:42 +0000 Subject: [PATCH] * Home page: Add colombo-bt.i2p, remove keys.i2p Icon created and contributed by colombo-bt.i2p --- .../java/src/net/i2p/router/web/HomeHelper.java | 3 ++- history.txt | 4 ++++ installer/resources/hosts.txt | 1 + .../themes/console/images/colomboicon.png | Bin 0 -> 2829 bytes .../java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 installer/resources/themes/console/images/colomboicon.png diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 12b5658a27..ecb25a3fb8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -37,6 +37,7 @@ public class HomeHelper extends HelperBase { static final String DEFAULT_FAVORITES = _x("Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S + + "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S + _x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "itoopie_sm.png" + S + _x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "itoopie_sm.png" + S + "echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "itoopie_sm.png" + S + @@ -45,7 +46,7 @@ public class HomeHelper extends HelperBase { _x("Anonymous Git Hosting") + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S + "Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S + _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "book.png" + S + - _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S + + //_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S + _x("killyourtv.i2p") + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "itoopie_sm.png" + S + _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "itoopie_sm.png" + S + "Planet I2P" + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "itoopie_sm.png" + S + diff --git a/history.txt b/history.txt index ba6702913a..7795ea79b1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2012-07-18 zzz + * Home page: Add colombo-bt.i2p, remove keys.i2p + * i2psnark: Clear rate stats when restarting torrent + 2012-07-16 str4d * console: work towards better integration - Wrapped the bundled apps in iFrames (with a link in the page header to diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt index 3274dfe323..b6ae538cae 100644 --- a/installer/resources/hosts.txt +++ b/installer/resources/hosts.txt @@ -335,3 +335,4 @@ i2p-javadocs.i2p=pihB-m2To7PT-EOY1x-K5PFeV1j~KTz7inAbpm82bJpeb-wdLJ1AocMMQ6feN2l plugins.i2p=4GdwNoyPq-tlATiocmygKgZv1gJ1Gr1XtZRQ1T-5RozH54aPDKuVp6E9eTdZm3PyJ~AVSo4aFViZSCoMwctE6v6Mg5iAxHysZqn1u3XsXjFg3FttFQOSxGjXkjQG98kA2K~yCrWbD-YAVANGrJsQ6VjXSWsKP95WIplSxcBA25vE~eLuFxvAgqLX0LWAvB~liSdI3QrDQ1YNhyaAn4sisLV9aViMncE90hjxBYR1llxsv5N4CKh9kPl3pNSfF0J9-kxGotqXGdVcXYjo18fpdEurGmghkz4JXgRMg7APcOy97XMjWNe~7Ct~Z17zxFzzQUYC4nSsDN0G2t~tp~VWzZtKDSDq1~B0~wfiN1srt2zBBDfcABWFw7SML4QfSiw6ipbXeJD8hWfVSS~oCMzf7zS4bPakieTigHsMjJ4OnLQtuatiXHgfY2hTuUbUvNhvzbKwQ2PPrOdbxFkzDoOazAsxTMFrDWKeZHYEAwSdWOIVJGxXmQe-r-BvYaMB00~5AAAA keys.i2p=Imqtlip0MVs9~UGTdl~FY1YV7QhpmzEM3xVjAnd5wxuKfq7xQN0RxfEadFzz2QkPW5QkFh2XyXRkkArZbgG1j0FudZYfmwfYcmxX-iDMsTFyh-J7AirXDmXLviZWOaUOU30NU1DcBUF-PrVc5rL2F1ML2KtqF2LeanRZHSjuIsZTzxMw5Nvb9nWIlFaBU8vwEdaH3zx3nRSujNki~v2DadexbpPQlwfHvVupwSOX6D79A63aO3mcuuJe756nu0kBaF~Bs4UZE1G2doZAUS6lFAJUTKjJDKsbz8RP76t6iL6IgqF8xD~Y-uP3yNazNaSTgWbEUSsoIe~oI-kGdoSFrGL0gGbBlyQRvXbz-lQPXqHjh5~RXeEgqkbSwjE0MF29U5S~1MmBaSJ1NmfMcAAkarAe44ub-LTAWkFvuA9mcjhDTpeFSRjxaKCmJZ-twbNrHqDY4EtVZvTWTpHYy3g4s2bR7OKFT26QdmLYfsa9fHGcy8TGDwAI9Pjov5bGa8LlAAAA killyourtv.i2p=qWUvUuLmH7MyjcxBcMbyD1c4aIypzlV79Jq5POkC12Yq5hLBs7pnHbJIYJm4BENze2COzuWPQSMXICV91Ig~Drpc5vYNiM~dsLKow7CoFJUcNnhHNBlC0C6Y2Un-ueF43rLp7kWUub3qflO93QoYOXiD~avWu1jiAmU1YsxVAeLwDDML9kQQ3uQtuXa2n0EqxHvfdRsFdD7k1WUg5Ocet64MMAehKTr4LalxymOfG7MlV-mbR7Czt~xumpuc95x~6M7470nq33FHrwcPGOvr-3cM1CBi7QpUeibYwODZSxtLVfUTjqB1TzrVKt2M-Wt9XyJa6c4wnpVoneD7sb2agnq0P-wiA3h-bpGLsx-SB4G82c6E8MUG6a~aLdsqMUdLSc7HMu5TQ55LXJKnJzrmWy~zaUKy28JhlXQgYG8NHriCwq1CstGEUCWIzQQYdvEY6PU8L5jCT5Zs1jklX~g6Sxrv-ooDeznJWraW4b-IsSGon0qObwyTvhavVqkwJ5jkAAAA +colombo-bt.i2p=OlhoyOifYe50Fq3b3K3NU3vRvU9Qjzom9sqLuwQw4K3AgPHlpMuz7HuspDMnqvNoXqYs-eTNK83bNZ105eiG1y3p2SchC7Lf6WhEedBxllF0L1vWdmdbnb1COm6GoU~8xkOxHBjnJl302Z-YsfPtsQNs0SzWnbP03E0ZUYDX6lBwabgg2Jaygo2IyW9UcmP1GHoAcc4Vtj1LXsTV0IoeB2Zp1OOv9t~icuLVSm6Rpl-FAl7AN0PyzJDtNbSVcCb89AREO4V7uc22aDxofmvIGQDNtDqK5UxATT-TTlTvTPbsTV8w3qJLFXYHbjklbNiI8P3Z9e~RyVqiWgzRdCfii3pBQ2-akwV7zaXMdsUT9T5DRiOGxYmsXK0kgr84W4khnj7aDYOzZAlOsUw890hqY4vyaslMX-UpNry8KXyS-QK-323sPcGfGta5rKpxlCAlwQ8L4RnWggHVlKo-y5fLxSQsy~EBqZIOg-zgQiHUoCCUiYukL-2EOrWhmt8jRzsGAAAA diff --git a/installer/resources/themes/console/images/colomboicon.png b/installer/resources/themes/console/images/colomboicon.png new file mode 100644 index 0000000000000000000000000000000000000000..b64020f173b262bf02971c2ad62e4041acffefa0 GIT binary patch literal 2829 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 literal 0 HcmV?d00001 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9319fc01c9..0bd65feeba 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 22; + public final static long BUILD = 23; /** for example "-test" */ public final static String EXTRA = "";