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 2019/07/03 07:22:44 UTC
[isis] branch v2 updated (1fdbdd8 -> 213d2da)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 1fdbdd8 Merge branch 'ISIS-2062-antora' into v2
add 07001aa ISIS-2062: further fixes
new 213d2da Merge branch 'ISIS-2062-antora' into v2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
antora/components/rg/modules/ant/pages/Column.adoc | 1 -
.../components/rg/modules/ant/pages/Nullable.adoc | 4 +-
.../rg/modules/ant/pages/ParameterLayout.adoc | 11 +++--
.../replacing-default-service-implementations.adoc | 9 +---
antora/components/ug/modules/fun/nav.adoc | 3 +-
.../fun/pages/programming-model/actions.adoc | 34 +++++++-------
.../fun/pages/programming-model/collections.adoc | 10 ++---
.../programming-model/domain-services/menu.adoc | 3 +-
.../pages/programming-model/inject-services.adoc | 38 +++++++++-------
.../fun/pages/programming-model/mixins.adoc | 1 +
.../mixins/contributed-action.adoc | 16 ++++---
.../mixins/contributed-collection.adoc | 20 +++++----
.../mixins/contributed-property.adoc | 20 +++++----
.../mixins/contributed-services.adoc | 44 ------------------
.../programming-model/mixins/inferred-name.adoc | 5 +--
.../mixins/nested-static-classes.adoc | 43 +++---------------
.../mixins/programmatic-usage.adoc | 2 +-
.../properties-vs-parameters.adoc | 3 +-
.../fun/pages/programming-model/properties.adoc | 52 +++++++++++-----------
.../fun/pages/programming-model/view-models.adoc | 11 ++---
.../view-models/dto/generating-xsds.adoc | 18 +++-----
.../view-models/dto/versioning.adoc | 3 +-
.../pages/programming-model/view-models/jaxb.adoc | 17 +++----
.../jaxb/referencing-domain-entities.adoc | 6 +--
.../programming-model/view-models/non-jaxb.adoc | 9 ++--
25 files changed, 154 insertions(+), 229 deletions(-)
delete mode 100644 antora/components/ug/modules/fun/pages/programming-model/mixins/contributed-services.adoc
[isis] 01/01: Merge branch 'ISIS-2062-antora' into v2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 213d2da61e0ff23be9818663e293b777272155aa
Merge: 1fdbdd8 07001aa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 3 08:22:28 2019 +0100
Merge branch 'ISIS-2062-antora' into v2
antora/components/rg/modules/ant/pages/Column.adoc | 1 -
.../components/rg/modules/ant/pages/Nullable.adoc | 4 +-
.../rg/modules/ant/pages/ParameterLayout.adoc | 11 +++--
.../replacing-default-service-implementations.adoc | 9 +---
antora/components/ug/modules/fun/nav.adoc | 3 +-
.../fun/pages/programming-model/actions.adoc | 34 +++++++-------
.../fun/pages/programming-model/collections.adoc | 10 ++---
.../programming-model/domain-services/menu.adoc | 3 +-
.../pages/programming-model/inject-services.adoc | 38 +++++++++-------
.../fun/pages/programming-model/mixins.adoc | 1 +
.../mixins/contributed-action.adoc | 16 ++++---
.../mixins/contributed-collection.adoc | 20 +++++----
.../mixins/contributed-property.adoc | 20 +++++----
.../mixins/contributed-services.adoc | 44 ------------------
.../programming-model/mixins/inferred-name.adoc | 5 +--
.../mixins/nested-static-classes.adoc | 43 +++---------------
.../mixins/programmatic-usage.adoc | 2 +-
.../properties-vs-parameters.adoc | 3 +-
.../fun/pages/programming-model/properties.adoc | 52 +++++++++++-----------
.../fun/pages/programming-model/view-models.adoc | 11 ++---
.../view-models/dto/generating-xsds.adoc | 18 +++-----
.../view-models/dto/versioning.adoc | 3 +-
.../pages/programming-model/view-models/jaxb.adoc | 17 +++----
.../jaxb/referencing-domain-entities.adoc | 6 +--
.../programming-model/view-models/non-jaxb.adoc | 9 ++--
25 files changed, 154 insertions(+), 229 deletions(-)