From 1e2d2f2495e8409b4be31ff947864167a67fd6bb Mon Sep 17 00:00:00 2001
From: tryan <tim@theryanfamily.info>
Date: Wed, 09 Apr 2014 20:55:29 -0400
Subject: [PATCH] Switch to self-hosted flotr2 graphs from Google Charts
---
src/main/java/com/gitblit/wicket/WicketUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index f1f084c..bba3f79 100644
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -434,7 +434,7 @@
parameterMap.put("pg", String.valueOf(pageNumber));
return new PageParameters(parameterMap);
}
-
+
public static PageParameters newBlameTypeParameter(String repositoryName,
String commitId, String path, String blameType) {
Map<String, String> parameterMap = new HashMap<String, String>();
@@ -536,7 +536,7 @@
// past
title = timeUtils.timeAgo(date);
}
- if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {
+ if (title != null && (System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {
String tmp = dateString;
dateString = title;
title = tmp;
--
Gitblit v1.9.1