From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001 From: Jason Pyeron <jpyeron@pdinc.us> Date: Sun, 19 Aug 2012 21:35:52 -0400 Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html --- src/com/gitblit/wicket/panels/ActivityPanel.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java index f75cf7d..2e70a9a 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/com/gitblit/wicket/panels/ActivityPanel.java @@ -56,7 +56,7 @@ public void populateItem(final Item<Activity> activityItem) { final Activity entry = activityItem.getModelObject(); - activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone())); + activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils())); // display the commits in chronological order DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commit", @@ -68,17 +68,17 @@ // commit time of day commitItem.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent() - .getWhen(), getTimeZone())); + .getWhen(), getTimeZone(), getTimeUtils())); // avatar - commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36)); + commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40)); // merge icon if (commit.getParentCount() > 1) { commitItem.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png")); } else { - commitItem.add(WicketUtils.newBlankImage("commitIcon")); + commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false)); } // author search link -- Gitblit v1.9.1