diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index b323f6b78abe76800e0eb5f9f302b90c48ed9295..976fb8114293cd277e45f14949d17375c2b09371 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -215,11 +215,12 @@ public class StatsGenerator { buf.append(")"); } if (curRate.getSummaryListener() != null) { - buf.append(" <a href=\"viewstat.jsp?stat=").append(name); - buf.append("&period=").append(periods[i]); + buf.append(" <a href=\"graph?stat=").append(name) + .append('.').append(periods[i]); buf.append("\">").append(_("Graph Data")).append("</a> - "); - buf.append(" <a href=\"viewstat.jsp?stat=").append(name); - buf.append("&period=").append(periods[i]).append("&showEvents=true\">").append(_("Graph Event Count")).append("</a> - "); + buf.append(" <a href=\"graph?stat=").append(name) + .append('.').append(periods[i]); + buf.append("&showEvents=true\">").append(_("Graph Event Count")).append("</a> - "); buf.append("<a href=\"viewstat.jsp?stat=").append(name); buf.append("&period=").append(periods[i]); buf.append("&format=xml\">").append(_("Export Data as XML")).append("</a>"); diff --git a/history.txt b/history.txt index 41e180e1dcc8f7bf997c6e390a9f36b7b40de4ae..59aa2af21efe78fe578cff015e104465c4eaba3a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,13 @@ +2012-11-13 zzz + * Bandwidth Limiter: Fix stats broken in -1 + * HTTP Proxy: Store referrer of new addresses in address book + * NTCP: + - Fix NPE (ticket #770) + - Use ByteCache for buffers + * SOCKS: Reduce log level of connect errors + * SSU: Fix bug that would drop 512 byte messages + * stats.jsp: Link to graph page, not single image + 2012-11-10 kytv * eepget: Add logic to figure out the path to java.exe (java isn't always added to the system path in Windows) (ticket #769) @@ -92,7 +102,7 @@ - Prep for RouterApp interface by storing context in a field, shuffle around what's static and what's not (ticket #347) - Convert to RouterApp interface - - Convert from basic to digest authentication + - Convert from basic to digest authentication (ticket #652) - Use new password manager (ticket #731) * Core: New password manager for storing passwords in router.config in consistent ways, including salting and hashing if possible. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4e28a2c8d2676ff98ee569a93ae883ef407d9461..c10128fe6223a59f4fa2320e38c3309487438a87 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 = 5; + public final static long BUILD = 6; /** for example "-test" */ public final static String EXTRA = "";