[10/10] syncope git commit: Merge branch 'master' into SYNCOPE-652

[ilgrosso]

Merge branch 'master' into SYNCOPE-652


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

Branch: refs/heads/SYNCOPE-652
Commit: d1bd87ad9e7a3b6d7a27133fdd69fa7007a2ab7d
Parents: d8b71cc ce8d4ed
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Thu Jul 23 10:56:15 2015 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Thu Jul 23 10:56:15 2015 +0200

----------------------------------------------------------------------
 .../client/console/pages/EditUserModalPage.java       |  6 ++----
 .../syncope/client/console/pages/UserModalPage.java   | 14 ++++++--------
 .../client/console/pages/UserSelfModalPage.java       |  9 +++++++++
 .../client/console/pages/UserTemplateModalPage.java   |  4 ++--
 .../client/console/pages/ViewUserModalPage.java       |  2 +-
 .../client/console/panels/UserDetailsPanel.java       |  2 +-
 pom.xml                                               |  2 +-
 7 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/d1bd87ad/pom.xml
----------------------------------------------------------------------