You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/09/09 00:35:55 UTC
[2/2] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae'
Merge remote-tracking branch 'origin/2.3-gae'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e5dc9190
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e5dc9190
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e5dc9190
Branch: refs/heads/master
Commit: e5dc9190f9902d770dd0bbaca3d9efa393a7643f
Parents: 19b6bf8 ef18a73
Author: ddekany <dd...@apache.org>
Authored: Wed Sep 9 00:34:34 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Sep 9 00:34:34 2015 +0200
----------------------------------------------------------------------
.../core/BuiltInsForMultipleTypes.java | 2 +-
src/main/java/freemarker/core/Environment.java | 55 ++++++++------------
.../core/InvalidFormatStringException.java | 2 +-
src/main/java/freemarker/core/MessageUtil.java | 2 +-
.../freemarker/core/TemplateDateFormat.java | 37 ++++++-------
.../core/TemplateDateFormatFactory.java | 23 ++++----
.../freemarker/core/TemplateNumberFormat.java | 20 +++----
.../core/TemplateNumberFormatFactory.java | 12 +++--
.../freemarker/core/TemplateValueFormat.java | 33 ++++++++++++
.../core/TemplateValueFormatException.java | 37 +++++++++++++
.../core/TemplateValueFormatFactory.java | 28 ++++++++++
.../core/UnformattableDateException.java | 5 +-
.../core/UnformattableNumberException.java | 2 +-
...nDateTypeFormattingUnsupportedException.java | 2 +-
src/manual/book.xml | 25 +++++++--
.../core/BaseNTemplateNumberFormatFactory.java | 4 +-
.../templates/dateformat-iso-like.ftl | 10 ++--
17 files changed, 201 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e5dc9190/src/main/java/freemarker/core/BuiltInsForMultipleTypes.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e5dc9190/src/main/java/freemarker/core/Environment.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e5dc9190/src/main/java/freemarker/core/MessageUtil.java
----------------------------------------------------------------------