diff --git a/build.xml b/build.xml index ff1b7ff73..5b3abd8f8 100644 --- a/build.xml +++ b/build.xml @@ -362,6 +362,8 @@ + + diff --git a/history.txt b/history.txt index 1408fa149..fe338bdc3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-01-09 zzz + * Include new eepsite indexes in pkg + 2010-01-06 zzz * Summary bar tweaks diff --git a/installer/resources/eepsite_index.html b/installer/resources/eepsite_index.html index 83f1612c6..33bec5c50 100644 --- a/installer/resources/eepsite_index.html +++ b/installer/resources/eepsite_index.html @@ -6,7 +6,11 @@

Welcome to your eepsite

-

(Deutsch)

+

+(Deutsch) +(French) +(Russian) +

This is your eepsite - simply edit the files under ~/.i2p/eepsite/docroot/ (Linux) or %APPDATA%\I2P\eepsite\docroot\ (Windows) and they'll be reachable by others once you follow the instructions below. diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 42d73c81c..00979a190 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -196,12 +196,7 @@ div.refresh { padding: 2px 0 0px 0 !important; } -div.routersummary a:link, div.routersummary a:visited { - text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.5); -} - div.routersummary a:hover { - text-shadow: 0px 0px 0.5px rgba(255, 255, 255, 0.7); color: #f60; } @@ -470,7 +465,7 @@ table { cell-padding: 1px; font-size: 7pt; background: #b4c8ff url('images/tabletitlelight.png') repeat-x; - font: 7pt/130% "Lucida Sans Unicode", Verdana, Bitstream Vera Sans", Tahoma, Helvetica, sans-serif; + font: 7pt/130% "Lucida Sans Unicode", Verdana, "Bitstream Vera Sans", Tahoma, Helvetica, sans-serif; } table hr { diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 32a2083be..684de3214 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 17; + public final static long BUILD = 18; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 312fce6a7..dc72ddd16 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -910,6 +910,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { return TIMEOUT_MULTIPLIER * (int)responseTime; // give it up to 3x the average response time } + /** unused (overridden in FNDF) */ public void sendStore(Hash key, DataStructure ds, Job onSuccess, Job onFailure, long sendTimeout, Set toIgnore) { if ( (ds == null) || (key == null) ) { if (onFailure != null) diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java index 94b824671..a7dd9fb0c 100644 --- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java +++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java @@ -70,9 +70,9 @@ public class ClientAppConfig { /* * Go through the properties, and return a List of ClientAppConfig structures */ - public static List getClientApps(RouterContext ctx) { + public static List getClientApps(RouterContext ctx) { Properties clientApps = getClientAppProps(ctx); - List rv = new ArrayList(5); + List rv = new ArrayList(8); int i = 0; while (true) { String className = clientApps.getProperty(PREFIX + i + ".main");