Merge branch 'PortletHub' of j:\git\pluto-git into PortletHub
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/de9b04ec
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/de9b04ec
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/de9b04ec
Branch: refs/heads/PortletHub
Commit: de9b04ecd06ca6f79024d9bb11b76a2356a68d29
Parents: 210f7bc e449363
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Tue Nov 11 22:08:58 2014 +0100
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Tue Nov 11 22:08:58 2014 +0100
----------------------------------------------------------------------
.../WEB-INF/themes/pluto-default-theme.jsp | 72 +++++-
pluto-portal/src/main/webapp/portletHubImpl.js | 224 +++++++++++++------
2 files changed, 218 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
|