[midPoint-git] [Evolveum/midpoint] 7d6c80: fixing protected shadows (protected flag should no...

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7d6c80a01982fcae0cc4c9ed03dd6ee4b4a7015a
      https://github.com/Evolveum/midpoint/commit/7d6c80a01982fcae0cc4c9ed03dd6ee4b4a7015a
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java

  Log Message:
  -----------
  fixing protected shadows (protected flag should not be stored in repo)..


  Commit: 7cd18012f4b11f0cade7f4897759e5f29d652774
      https://github.com/Evolveum/midpoint/commit/7cd18012f4b11f0cade7f4897759e5f29d652774
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserListItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid/resource-dummy.xml
    A samples/objects/object-template-user-nickname.xml
    A samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    A samples/resources/csvfile/midpoint-flatfile-bulk-action.csv
    A samples/tasks/bulk-actions/recompute-users-without-nickname-starting-on-b.xml
    A samples/tasks/bulk-actions/recompute-users-without-nickname.xml

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


  Commit: dbd36878c21a36c3ef0a18d318b63bc865b5da73
      https://github.com/Evolveum/midpoint/commit/dbd36878c21a36c3ef0a18d318b63bc865b5da73
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-05-30 (Fri, 30 May 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M samples/resources/csvfile/midpoint-flatfile-bulk-action.csv

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


Compare: https://github.com/Evolveum/midpoint/compare/20a07ba747eb...dbd36878c21a