[midPoint-git] [Evolveum/midpoint] 422857: Merge Objects: switch direction button

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 42285766f416683d58f97d700798a21cdb300a18
      https://github.com/Evolveum/midpoint/commit/42285766f416683d58f97d700798a21cdb300a18
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    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

  Log Message:
  -----------
  Merge Objects: switch direction button


  Commit: 72f599b31f718f36fffbaa90f09bbfd5765c3bbb
      https://github.com/Evolveum/midpoint/commit/72f599b31f718f36fffbaa90f09bbfd5765c3bbb
  Author: honchar <honchar at evolveum.com>
  Date:   2016-10-21 (Fri, 21 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.java

  Log Message:
  -----------
  Merge Objects: models fix


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

  Changed paths:
    M build-system/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java

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


Compare: https://github.com/Evolveum/midpoint/compare/b6451cc69bdb...b7a8b3fe3df4