You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/11/12 21:01:52 UTC

[10/50] [abbrv] isis git commit: Merge branch 'ISIS-1151' of https://github.com/Ginns/isis into ISIS-1151_pr-35

Merge branch 'ISIS-1151' of https://github.com/Ginns/isis into ISIS-1151_pr-35


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

Branch: refs/heads/ISIS-1224-select2-v4
Commit: 21297a72272bbb8c163b57acfc433831dc37dd5d
Parents: bbc580d 6839d18
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Nov 6 06:05:28 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Nov 6 06:05:28 2015 +0000

----------------------------------------------------------------------
 .../applib/annotation/CollectionLayout.java     |  6 ++
 .../defaultview/DefaultViewFacet.java           | 26 +++++++
 .../defaultview/DefaultViewFacetAbstract.java   | 35 ++++++++++
 ...tViewFacetForCollectionLayoutAnnotation.java | 41 +++++++++++
 ...ewFacetOnCollectionFromLayoutProperties.java | 46 ++++++++++++
 .../layout/CollectionLayoutFacetFactory.java    | 11 +++
 .../CollectionLayoutFacetRepr.java              |  1 +
 .../layoutmetadata/DefaultViewFacetRepr.java    | 24 +++++++
 .../json/LayoutMetadataReaderFromJson.java      | 10 +++
 .../selector/CollectionSelectorHelper.java      | 73 ++++++++++++++------
 10 files changed, 253 insertions(+), 20 deletions(-)
----------------------------------------------------------------------