Merge branch 'master' into SYNCOPE-156
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bbb94a99 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bbb94a99 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bbb94a99 Branch: refs/heads/SYNCOPE-156 Commit: bbb94a99fbc19e219dda417097e940950706c204 Parents: a95b955 0e5694a Author: Marco Di Sabatino Di Diodoro <[email protected]> Authored: Wed Aug 19 12:08:10 2015 +0200 Committer: Marco Di Sabatino Di Diodoro <[email protected]> Committed: Wed Aug 19 12:08:10 2015 +0200 ---------------------------------------------------------------------- .../syncope/client/console/pages/BasePage.java | 5 +- .../console/panels/NotificationPanel.java | 2 +- .../client/console/panels/ResourceModal.java | 1 - .../client/console/topology/Topology.java | 1 + .../console/topology/TopologyNodePanel.java | 10 +- .../markup/html/form/ActionLinksPanel.java | 192 ++++++++++++++++++- .../META-INF/resources/css/syncopeConsole.css | 4 + .../syncope/client/console/pages/BasePage.html | 2 +- 8 files changed, 204 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
