@@ -253,7 +253,7 @@ web.datestampLongFormat = EEEE, MMMM d, yyyy | |||
# <http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html> | |||
# | |||
# SINCE 0.5.0 | |||
web.datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z | |||
web.datetimestampLongFormat = EEEE, MMMM d, yyyy HH:mm Z | |||
# Mount URL parameters | |||
# This setting controls if pretty or parameter URLs are used. |
@@ -4,6 +4,10 @@ | |||
**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] *released %BUILDDATE%* | |||
#### changes | |||
- web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50) | |||
#### additions | |||
- Allow relinking HEAD to a branch or a tag (Github/plm) |
@@ -492,7 +492,7 @@ public class WicketUtils { | |||
public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) { | |||
String format = GitBlit.getString(Keys.web.datetimestampLongFormat, | |||
"EEEE, MMMM d, yyyy h:mm a z"); | |||
"EEEE, MMMM d, yyyy HH:mm Z"); | |||
DateFormat df = new SimpleDateFormat(format); | |||
if (timeZone != null) { | |||
df.setTimeZone(timeZone); |
@@ -66,7 +66,7 @@ public class BlamePage extends RepositoryPage { | |||
add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); | |||
String format = GitBlit.getString(Keys.web.datetimestampLongFormat, | |||
"EEEE, MMMM d, yyyy h:mm a z"); | |||
"EEEE, MMMM d, yyyy HH:mm Z"); | |||
final DateFormat df = new SimpleDateFormat(format); | |||
df.setTimeZone(getTimeZone()); | |||
List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId); |