[jira] [Comment Edited] (FREEMARKER-83) Introduce new special variable "outer_template_name" beside "main_template_name"

2018-03-09 Thread Daniel Dekany (JIRA)
[ https://issues.apache.org/jira/browse/FREEMARKER-83?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16394089#comment-16394089 ] Daniel Dekany edited comment on FREEMARKER-83 at 3/10/18 7:36 AM: --

[jira] [Commented] (FREEMARKER-83) Introduce new special variable "outer_template_name" beside "main_template_name"

2018-03-09 Thread Daniel Dekany (JIRA)
[ https://issues.apache.org/jira/browse/FREEMARKER-83?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16394089#comment-16394089 ] Daniel Dekany commented on FREEMARKER-83: - It's outside the scope of this issue, but I plan to

[jira] [Resolved] (FREEMARKER-83) Introduce new special variable "outer_template_name" beside "main_template_name"

2018-03-09 Thread Daniel Dekany (JIRA)
[ https://issues.apache.org/jira/browse/FREEMARKER-83?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Daniel Dekany resolved FREEMARKER-83. - Resolution: Implemented Fix Version/s: 2.3.28-incubating

[3/3] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2018-03-09 Thread ddekany
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/6442fd76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6442fd76

[2/3] incubator-freemarker git commit: Renamed macro_caller_template_name to caller_template_name, as now it also works for #function. Updated and cleaned up related tests.

2018-03-09 Thread ddekany
Renamed macro_caller_template_name to caller_template_name, as now it also works for #function. Updated and cleaned up related tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/5f821f17

[1/3] incubator-freemarker git commit: FREEMARKER-83: Handle nicely when the callPlace is null

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/2.3 9c8f7ab74 -> 6442fd765 FREEMARKER-83: Handle nicely when the callPlace is null Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit:

incubator-freemarker git commit: Renamed macro_caller_template_name to caller_template_name, as it actually works for #function as well. Updated and cleaned up related tests.

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/3 59829da65 -> f48c81368 Renamed macro_caller_template_name to caller_template_name, as it actually works for #function as well. Updated and cleaned up related tests. Project:

incubator-freemarker git commit: Renamed macro_caller_template_name to caller_template_name, as now it also works for #function. Updated and cleaned up related tests.

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 81e33b951 -> 5f821f174 Renamed macro_caller_template_name to caller_template_name, as now it also works for #function. Updated and cleaned up related tests. Project:

incubator-freemarker git commit: FREEMARKER-83: Handle nicely when the callPlace is null

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 7adecaee2 -> 81e33b951 FREEMARKER-83: Handle nicely when the callPlace is null Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit:

[09/11] incubator-freemarker git commit: FREEMARKER-83: Added new special variable, macro_caller_template_name, which returns the name (path) of the template from which the current macro was called. I

2018-03-09 Thread ddekany
FREEMARKER-83: Added new special variable, macro_caller_template_name, which returns the name (path) of the template from which the current macro was called. It's mostly useful if you want to resolve paths relative to the caller template. Project:

[05/11] incubator-freemarker git commit: Manual: Some improvements in the description of settings

2018-03-09 Thread ddekany
Manual: Some improvements in the description of settings Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1aabd374 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1aabd374

[02/11] incubator-freemarker git commit: (Version history improvement)

2018-03-09 Thread ddekany
(Version history improvement) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ee52c77f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ee52c77f Diff:

[03/11] incubator-freemarker git commit: freemarker.template.utility.DeepUnwrap (a rarely used utility) now utilizes when the unwrapped TemplateModel implements TemplateHashModelEx2.getKeyValuePairIte

2018-03-09 Thread ddekany
freemarker.template.utility.DeepUnwrap (a rarely used utility) now utilizes when the unwrapped TemplateModel implements TemplateHashModelEx2.getKeyValuePairIterator(), and thus can unwrap such a hash value even if it has non-string keys. Also, it nows keeps the iteration order of the hashes,

[08/11] incubator-freemarker git commit: Added DirectiveCallPlace.getTemplate(); we aren't concerned about its BC impact anymore, as FM3 breaks BC anyway.

2018-03-09 Thread ddekany
Added DirectiveCallPlace.getTemplate(); we aren't concerned about its BC impact anymore, as FM3 breaks BC anyway. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/846ef943 Tree:

[04/11] incubator-freemarker git commit: get_optional_template message typos and test improvements

2018-03-09 Thread ddekany
get_optional_template message typos and test improvements Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/21219f61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/21219f61

[11/11] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2018-03-09 Thread ddekany
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/9c8f7ab7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/9c8f7ab7

[07/11] incubator-freemarker git commit: (Javadoc improvement)

2018-03-09 Thread ddekany
(Javadoc improvement) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/60401773 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/60401773 Diff:

incubator-freemarker git commit: (Error message improvement)

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/3 6afa586f5 -> 59829da65 (Error message improvement) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/59829da6 Tree:

incubator-freemarker git commit: FREEMARKER-83: Modified how .macro_caller_template_name works... now it has no surprising restrictions, and is simpler.

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 4a5eec42d -> 7adecaee2 FREEMARKER-83: Modified how .macro_caller_template_name works... now it has no surprising restrictions, and is simpler. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo

incubator-freemarker git commit: Forward ported .macroCallerTemplateName from 2.3-gae: test

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/3 63173f9ac -> 6afa586f5 Forward ported .macroCallerTemplateName from 2.3-gae: test Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit:

incubator-freemarker git commit: Forward ported .macroCallerTemplateName from 2.3-gae

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/3 e4207a53e -> 63173f9ac Forward ported .macroCallerTemplateName from 2.3-gae Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit:

[1/2] incubator-freemarker git commit: Added DirectiveCallPlace.getTemplate(); we aren't concerned about its BC impact anymore, as FM3 breaks BC anyway.

2018-03-09 Thread ddekany
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 604017731 -> 4a5eec42d Added DirectiveCallPlace.getTemplate(); we aren't concerned about its BC impact anymore, as FM3 breaks BC anyway. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit:

[2/2] incubator-freemarker git commit: FREEMARKER-83: Added new special variable, macro_caller_template_name, which returns the name (path) of the template from which the current macro was called. It'

2018-03-09 Thread ddekany
FREEMARKER-83: Added new special variable, macro_caller_template_name, which returns the name (path) of the template from which the current macro was called. It's mostly useful if you want to resolve paths relative to the caller template. Project:

incubator-freemarker-site git commit: Better FreeMarker IDE download URL

2018-03-09 Thread ddekany
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 911277f2b -> 48f8b14d4 Better FreeMarker IDE download URL Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit:

incubator-freemarker-site git commit: Better FreeMarker IDE download URL

2018-03-09 Thread ddekany
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 95c34ee30 -> 25563e2f1 Better FreeMarker IDE download URL Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit:

incubator-freemarker-site git commit: (Typo fix)

2018-03-09 Thread ddekany
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 65e851643 -> 95c34ee30 (Typo fix) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/95c34ee3 Tree:

incubator-freemarker-site git commit: Updated "FreeMarker IDE" installation instructions due to its removal from JBoss Tools.

2018-03-09 Thread ddekany
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site acc04d820 -> 911277f2b Updated "FreeMarker IDE" installation instructions due to its removal from JBoss Tools. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit:

incubator-freemarker-site git commit: Updated "FreeMarker IDE" installation instructions due to its removal from JBoss Tools.

2018-03-09 Thread ddekany
Repository: incubator-freemarker-site Updated Branches: refs/heads/master e461cb1fe -> 65e851643 Updated "FreeMarker IDE" installation instructions due to its removal from JBoss Tools. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: