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:02:20 UTC

[38/50] [abbrv] isis git commit: Merge branch 'ISIS-1232'

Merge branch 'ISIS-1232'


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

Branch: refs/heads/ISIS-1224-select2-v4
Commit: 49474d7f62e5199c95aa516c30e271c6b36acc8b
Parents: 06630df 0df5504
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 10 16:46:19 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 10 16:46:19 2015 +0000

----------------------------------------------------------------------
 .../domainobjects/DomainObjectReprRenderer.java    | 17 ++++++++++-------
 .../ObjectCollectionReprRenderer.java              | 12 +++++++-----
 .../domainobjects/ObjectPropertyReprRenderer.java  | 12 ++++++++----
 .../rendering/LinkFollowSpecsTest_follow.java      | 14 ++++++++++++++
 .../restfulobjects/server/ResourceContext.java     |  8 +++++---
 5 files changed, 44 insertions(+), 19 deletions(-)
----------------------------------------------------------------------