You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/12/10 12:38:45 UTC
[7/8] isis git commit: Merge branch 'maint-1.13.2'
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/264f155a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/264f155a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/264f155a
Branch: refs/heads/master
Commit: 264f155aa99706d399a95949ca594782cd712e17
Parents: 567962a acb5c8b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Dec 10 12:35:54 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Dec 10 12:35:54 2016 +0000
----------------------------------------------------------------------
.../guides/_ugvw_configuration-properties.adoc | 50 ++++-
.../wicket/viewer/IsisWicketApplication.java | 12 +-
.../settings/WicketViewerSettingsDefault.java | 20 ++
.../wicket/model/isis/WicketViewerSettings.java | 32 ++-
.../isis/WicketViewerSettingsAccessor.java | 26 +++
.../viewer/wicket/model/models/ActionModel.java | 42 ++--
.../wicket/model/models/HasExecutingPanel.java | 24 ++
.../viewer/wicket/model/models/ScalarModel.java | 13 +-
.../actions/ActionParametersFormPanel.java | 128 ++---------
.../property/PropertyEditFormPanel.java | 129 ++---------
.../linkandlabel/ActionLinkFactoryAbstract.java | 74 +++++-
.../wicket/ui/pages/bootstrap-overrides.css | 13 +-
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 11 +
.../ui/panels/PromptFormPanelAbstract.java | 225 +++++++++++++++++++
.../webapp/WEB-INF/viewer_wicket.properties | 13 ++
.../webapp/WEB-INF/viewer_wicket.properties | 23 +-
16 files changed, 565 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/264f155a/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/264f155a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------