Merge branch 'maint-1.13.2'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/567962a9 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/567962a9 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/567962a9 Branch: refs/heads/master Commit: 567962a967c37d9ae6aaff8c4a6e56811292be54 Parents: f057d29 bca9bfa Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Fri Dec 9 09:09:07 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Fri Dec 9 09:09:07 2016 +0000 ---------------------------------------------------------------------- .../guides/_ugvw_configuration-properties.adoc | 53 ++++++++++++++------ .../wicket/viewer/IsisWicketApplication.java | 4 +- .../settings/WicketViewerSettingsDefault.java | 5 ++ .../wicket/model/isis/WicketViewerSettings.java | 7 ++- .../components/scalars/ScalarPanelAbstract.java | 1 - .../scalars/ScalarPanelTextFieldAbstract.java | 40 ++++++++++++++- .../webapp/WEB-INF/viewer_wicket.properties | 10 +++- 7 files changed, 99 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/567962a9/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/567962a9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java ----------------------------------------------------------------------
