diff --git a/LICENSE.txt b/LICENSE.txt index e512039185..e5d7a1bf41 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -285,6 +285,7 @@ Applications: - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/ FatCow icons: See licenses/LICENSE-FatCowIcons.txt Fugue Icons: See licenses/LICENSE-FugueIcons.txt + Feather icons: Copyright (c) 2013-2017 Cole Bemis; see licenses/LICENSE-Feather.txt Router Console and I2PSnark themes: Some images licensed under a Creative Commons 2.0 license. diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java index 355dfc903e..9edc0bce09 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import net.i2p.CoreVersion; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.router.web.App; @@ -227,7 +228,9 @@ public class HomeHelper extends HelperBase { "
" + // usability: add tabindex -1 so we avoid 2 tabs per app "" + - "\"\"" + + "\"\"" + "
\n" + "
" + "
" + diff --git a/history.txt b/history.txt index 35ec410a52..839355c280 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,14 @@ +2019-03-11 zzz + * Console: New home page icons + +2019-03-09 zzz + * Data: Consolidate offline key check + * I2CP: Add support for blinding secret + * i2ptunnel: Prevent registration auth if key offline + +2019-03-07 zzz + * NetDB: Minor performance improvement in selectors + 2019-03-06 zzz * NetDB: Fix flood version check, add version check for RedDSA diff --git a/installer/resources/themes/console/images/billiard_marker.png b/installer/resources/themes/console/images/billiard_marker.png index e7d0ef55e8..7914c66497 100644 Binary files a/installer/resources/themes/console/images/billiard_marker.png and b/installer/resources/themes/console/images/billiard_marker.png differ diff --git a/installer/resources/themes/console/images/book_addresses.png b/installer/resources/themes/console/images/book_addresses.png index 7902464bee..038d4369a0 100644 Binary files a/installer/resources/themes/console/images/book_addresses.png and b/installer/resources/themes/console/images/book_addresses.png differ diff --git a/installer/resources/themes/console/images/box_open.png b/installer/resources/themes/console/images/box_open.png index ed9a53873c..fcede6f958 100644 Binary files a/installer/resources/themes/console/images/box_open.png and b/installer/resources/themes/console/images/box_open.png differ diff --git a/installer/resources/themes/console/images/bug.png b/installer/resources/themes/console/images/bug.png index 563c364c79..d358b9d7f6 100644 Binary files a/installer/resources/themes/console/images/bug.png and b/installer/resources/themes/console/images/bug.png differ diff --git a/installer/resources/themes/console/images/chart_line.png b/installer/resources/themes/console/images/chart_line.png index eaa106809b..a8fb180518 100644 Binary files a/installer/resources/themes/console/images/chart_line.png and b/installer/resources/themes/console/images/chart_line.png differ diff --git a/installer/resources/themes/console/images/education.png b/installer/resources/themes/console/images/education.png index 697672ddff..d73b229f05 100644 Binary files a/installer/resources/themes/console/images/education.png and b/installer/resources/themes/console/images/education.png differ diff --git a/installer/resources/themes/console/images/email.png b/installer/resources/themes/console/images/email.png index 98a99c2883..f6e4858a07 100644 Binary files a/installer/resources/themes/console/images/email.png and b/installer/resources/themes/console/images/email.png differ diff --git a/installer/resources/themes/console/images/group.png b/installer/resources/themes/console/images/group.png index bea24889d1..00e8708c86 100644 Binary files a/installer/resources/themes/console/images/group.png and b/installer/resources/themes/console/images/group.png differ diff --git a/installer/resources/themes/console/images/group_gear.png b/installer/resources/themes/console/images/group_gear.png index be8cf761ea..d3fe8bbbc5 100644 Binary files a/installer/resources/themes/console/images/group_gear.png and b/installer/resources/themes/console/images/group_gear.png differ diff --git a/installer/resources/themes/console/images/i2psnark.png b/installer/resources/themes/console/images/i2psnark.png index 5528ff1a95..c54d9eec98 100644 Binary files a/installer/resources/themes/console/images/i2psnark.png and b/installer/resources/themes/console/images/i2psnark.png differ diff --git a/installer/resources/themes/console/images/i2pwiki_logo.png b/installer/resources/themes/console/images/i2pwiki_logo.png index 419807e5f7..82ddf2480e 100644 Binary files a/installer/resources/themes/console/images/i2pwiki_logo.png and b/installer/resources/themes/console/images/i2pwiki_logo.png differ diff --git a/installer/resources/themes/console/images/info/bandwidth.png b/installer/resources/themes/console/images/info/bandwidth.png index 9216261b20..3a18ee1b89 100644 Binary files a/installer/resources/themes/console/images/info/bandwidth.png and b/installer/resources/themes/console/images/info/bandwidth.png differ diff --git a/installer/resources/themes/console/images/info/console.png b/installer/resources/themes/console/images/info/console.png index 305109c4ac..d4ef0bc957 100644 Binary files a/installer/resources/themes/console/images/info/console.png and b/installer/resources/themes/console/images/info/console.png differ diff --git a/installer/resources/themes/console/images/info/plugin_link.png b/installer/resources/themes/console/images/info/plugin_link.png index 2d6a00e160..53ac237b4c 100644 Binary files a/installer/resources/themes/console/images/info/plugin_link.png and b/installer/resources/themes/console/images/info/plugin_link.png differ diff --git a/installer/resources/themes/console/images/info_rhombus.png b/installer/resources/themes/console/images/info_rhombus.png index 036733e748..1e4a530648 100644 Binary files a/installer/resources/themes/console/images/info_rhombus.png and b/installer/resources/themes/console/images/info_rhombus.png differ diff --git a/installer/resources/themes/console/images/paste_plain.png b/installer/resources/themes/console/images/paste_plain.png index c963ba62ef..ed3dabbb1c 100644 Binary files a/installer/resources/themes/console/images/paste_plain.png and b/installer/resources/themes/console/images/paste_plain.png differ diff --git a/installer/resources/themes/console/images/plugin.png b/installer/resources/themes/console/images/plugin.png index c1ee68def0..1e86711cb9 100644 Binary files a/installer/resources/themes/console/images/plugin.png and b/installer/resources/themes/console/images/plugin.png differ diff --git a/installer/resources/themes/console/images/question.png b/installer/resources/themes/console/images/question.png index e67fe63983..f76920876e 100644 Binary files a/installer/resources/themes/console/images/question.png and b/installer/resources/themes/console/images/question.png differ diff --git a/installer/resources/themes/console/images/script_gear.png b/installer/resources/themes/console/images/script_gear.png index 56fcf84a85..df415b4fbc 100644 Binary files a/installer/resources/themes/console/images/script_gear.png and b/installer/resources/themes/console/images/script_gear.png differ diff --git a/installer/resources/themes/console/images/server_32x32.png b/installer/resources/themes/console/images/server_32x32.png index 5b1fb2d7e9..c44d766e10 100644 Binary files a/installer/resources/themes/console/images/server_32x32.png and b/installer/resources/themes/console/images/server_32x32.png differ diff --git a/installer/resources/themes/console/images/support.png b/installer/resources/themes/console/images/support.png index c003c0df03..96dbb49dc4 100644 Binary files a/installer/resources/themes/console/images/support.png and b/installer/resources/themes/console/images/support.png differ diff --git a/installer/resources/themes/console/images/world.png b/installer/resources/themes/console/images/world.png index 644d9d53a7..cf7265b483 100644 Binary files a/installer/resources/themes/console/images/world.png and b/installer/resources/themes/console/images/world.png differ diff --git a/licenses/LICENSE-Feather.txt b/licenses/LICENSE-Feather.txt new file mode 100644 index 0000000000..b869713b76 --- /dev/null +++ b/licenses/LICENSE-Feather.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2017 Cole Bemis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index affa6f41b1..25340f779d 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 = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = "-rc";