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 2018/03/06 12:43:26 UTC
[isis] 01/02: Merge branch 'maint-1.16.2'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9da1440920bb1516caeeaf292f2de5599775c815
Merge: f071427 fb83729
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 6 12:31:58 2018 +0000
Merge branch 'maint-1.16.2'
# Conflicts:
# core/pom.xml
# core/runtime/pom.xml
# core/security-shiro/pom.xml
# example/application/helloworld/pom.xml
# example/application/simpleapp/pom.xml
# example/archetype/simpleapp/pom.xml
STATUS | 4 +++
.../documentation/src/main/asciidoc/doap_isis.rdf | 24 ++++++++++++++
.../documentation/src/main/asciidoc/downloads.adoc | 12 +++----
...ugfun_getting-started_helloworld-archetype.adoc | 2 +-
..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 11 ++++---
.../src/main/asciidoc/pages/tg/tg.adoc | 2 +-
.../release-notes/_release-notes_1.16.2.adoc | 36 +++++++++++++++++++++
.../main/asciidoc/release-notes/release-notes.adoc | 9 ++++++
adocs/template/document.html.erb | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 32 ++++++++++---------
.../actionresponse/ActionResultResponseType.java | 11 +++++++
.../actionmenu/serviceactions/CssMenuItem.java | 10 +++++-
.../serviceactions/ServiceActionUtil.java | 1 +
.../serviceactions/ServiceActionsPanel.java | 37 ++++++++++++++++++++++
.../serviceactions/TertiaryActionsPanel.html | 2 +-
.../components/actions/ActionParametersForm.java | 22 +++++++++++--
.../actions/ActionParametersFormPanel.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../columns/ObjectAdapterPropertyColumn.java | 3 +-
.../wicket/ui/components/header/HeaderPanel.html | 2 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/scalars/ScalarPanelAbstract2.java | 6 ++--
.../StandaloneCollectionPanel.java | 6 ++--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 4 +--
.../wicket/ui/pages/login/IsisSignInPanel.html | 4 +--
.../viewer/wicket/ui/util/CssClassAppender.java | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
.../META-INF/maven/archetype-metadata.xml | 19 -----------
.../application/logging-integtest.properties | 10 ++++++
.../application/DomainAppApplicationModule.java | 3 ++
.../module-simple/logging-integtest.properties | 9 ++++++
.../domainapp/modules/simple/SimpleModule.java | 5 ++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
37 files changed, 234 insertions(+), 74 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.