[midPoint-git] [Evolveum/midpoint] e2d24a: fixing MID-4563 and MID-4562

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: e2d24afe3689ae095f6807e5207a4bb899a539fc
      https://github.com/Evolveum/midpoint/commit/e2d24afe3689ae095f6807e5207a4bb899a539fc
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java

  Log Message:
  -----------
  fixing MID-4563 and MID-4562


  Commit: 839fde5bc90571ff5ae68e01b31bb715ea2ea1e8
      https://github.com/Evolveum/midpoint/commit/839fde5bc90571ff5ae68e01b31bb715ea2ea1e8
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M build-system/pom.xml
    M config/sql/_all/h2-3.8-all.sql
    M config/sql/_all/mysql-3.8-all-utf8mb4.sql
    M config/sql/_all/mysql-3.8-all.sql
    M config/sql/_all/oracle-3.8-all.sql
    M config/sql/_all/postgresql-3.8-all.sql
    M config/sql/_all/sqlserver-3.8-all.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssociationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectIntegrityCheckTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi/resource-dummy-peru-disable.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
    A model/model-intest/src/test/resources/multi/role-yellow-peru-disable.xml
    M model/model-intest/src/test/resources/password/security-policy-default-storage-hashing.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M pom.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M samples/model-client-sample/pom.xml
    A samples/tasks/bulk-actions/script-users-distinct.xml
    A samples/tasks/task-user-recompute-distinct.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/aeaa15afd211...839fde5bc905