[midPoint-git] [Evolveum/midpoint] 9c8d62: added more property keys for operations

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 9c8d629f8b7c50d9c122ca2dea1b5d24263adb5e
      https://github.com/Evolveum/midpoint/commit/9c8d629f8b7c50d9c122ca2dea1b5d24263adb5e
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  added more property keys for operations


  Commit: 47927d95b2c8c2ba4e8c5e5890d4289a1db2201f
      https://github.com/Evolveum/midpoint/commit/47927d95b2c8c2ba4e8c5e5890d4289a1db2201f
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint.properties


  Commit: 8b3a5a2a233450ead7d8de3406bd04ab4306efb5
      https://github.com/Evolveum/midpoint/commit/8b3a5a2a233450ead7d8de3406bd04ab4306efb5
  Author: honchar <honchar at evolveum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-prop-read-all-modify-some-user.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/71b1a3cc9b6f...8b3a5a2a2334