freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/2] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Tue, 08 Sep 2015 22:36:22 GMT
Merge remote-tracking branch 'origin/2.3-gae' into 2.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dfe0c097
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dfe0c097
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dfe0c097

Branch: refs/heads/2.3
Commit: dfe0c09782463ff2ee508834dc545c05e6421186
Parents: 016cc9e ef18a73
Author: ddekany <ddekany@apache.org>
Authored: Wed Sep 9 00:35:19 2015 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Wed Sep 9 00:35:19 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(-)
----------------------------------------------------------------------



Mime
View raw message