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/04/21 11:05:46 UTC

[10/12] isis git commit: Merge branch 'master' into ISIS-1291

Merge branch 'master' into ISIS-1291


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0aa50c1b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0aa50c1b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0aa50c1b

Branch: refs/heads/ISIS-1291
Commit: 0aa50c1bf96f95188ae50037023e7cac56784fb2
Parents: 69cd797 0f1fe2e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 21 09:51:50 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 21 09:51:50 2016 +0100

----------------------------------------------------------------------
 .../main/asciidoc/_powered-by_contactapp.adoc   |  37 ++++++
 .../src/main/asciidoc/_powered-by_estatio.adoc  |   4 +-
 .../guides/_rgsvc_api_MetamodelService.adoc     |  21 +++-
 .../src/main/asciidoc/powered-by.adoc           |   3 +-
 .../src/main/asciidoc/screencasts.adoc          | 123 +++++++++++++++++++
 .../services/metamodel/MetaModelService.java    |   1 +
 .../services/metamodel/MetaModelService2.java   |  69 +++++++++++
 .../applib/service/DomainChangeJdoAbstract.java |  19 +++
 .../facets/object/wizard/WizardFacet.java       |   4 -
 .../metamodel/MetaModelServiceDefault.java      |  47 ++++++-
 .../metamodel/spec/ObjectSpecification.java     |   1 +
 .../dflt/ObjectSpecificationDefault.java        |   6 +
 .../ObjectSpecificationOnStandaloneList.java    |   5 +
 .../testspec/ObjectSpecificationStub.java       |   4 +
 14 files changed, 331 insertions(+), 13 deletions(-)
----------------------------------------------------------------------