[midPoint-git] [Evolveum/midpoint] 16c7e0: Merge Objects gui implementing

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 16c7e06b9d1a925eb2d91713e368be325f426ed5
      https://github.com/Evolveum/midpoint/commit/16c7e06b9d1a925eb2d91713e368be325f426ed5
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java

  Log Message:
  -----------
  Merge Objects gui implementing


  Commit: 29fa771ec779262a401519897c67c3fc52419113
      https://github.com/Evolveum/midpoint/commit/29fa771ec779262a401519897c67c3fc52419113
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  Merge Objects gui implementing


  Commit: cefdce64d5d0baa8dd81dba65fb87e7a7deb5361
      https://github.com/Evolveum/midpoint/commit/cefdce64d5d0baa8dd81dba65fb87e7a7deb5361
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M .travis.yml
    M samples/evolveum/role-catalog.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/a47e3a76f28f...cefdce64d5d0