[midPoint-git] [Evolveum/midpoint] bcba2b: MID-3556 fixed (Deputy: delegation limit dialog la...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: bcba2b6f11dc4feb39107bac815f7f904df72d1c
      https://github.com/Evolveum/midpoint/commit/bcba2b6f11dc4feb39107bac815f7f904df72d1c
  Author: honchar <honchar at evolveum.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-3556 fixed (Deputy: delegation limit dialog label and content)


  Commit: 89c05984a10251428b5630d8dbdfe611381dfe5f
      https://github.com/Evolveum/midpoint/commit/89c05984a10251428b5630d8dbdfe611381dfe5f
  Author: honchar <honchar at evolveum.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/a06e3290d488...89c05984a102