[midPoint-git] [Evolveum/midpoint] c0a062: fix for MID-4034

[honchar]

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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java

  Log Message:
  -----------
  fix for MID-4034


  Commit: 7c250595c6d24362f2234d261121c06374ff1899
      https://github.com/Evolveum/midpoint/commit/7c250595c6d24362f2234d261121c06374ff1899
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    A model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    A model/model-intest/src/test/resources/security/role-manager-user-admin.xml
    M model/model-intest/testng-integration.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ResourceObjectEvent.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    A samples/stories/password-hash/csv.csv
    A samples/stories/password-hash/resource-csv.xml
    A samples/stories/password-hash/security-policy.xml
    A samples/stories/password-hash/system-configuration.xml

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


  Commit: 820cfd095868674c0cff818a333c2e448b196fad
      https://github.com/Evolveum/midpoint/commit/820cfd095868674c0cff818a333c2e448b196fad
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

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

  Log Message:
  -----------
  fix for MID-3991


  Commit: 07965c0334682686070a19b6bfc32da2b60690b6
      https://github.com/Evolveum/midpoint/commit/07965c0334682686070a19b6bfc32da2b60690b6
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/ReportPeerQueryInterceptor.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportNodeUtils.java

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


  Commit: e01c3ffacbd1be15e24f51f8f56ad902bf5e36a8
      https://github.com/Evolveum/midpoint/commit/e01c3ffacbd1be15e24f51f8f56ad902bf5e36a8
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java

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


Compare: https://github.com/Evolveum/midpoint/compare/9f3f6018479b...e01c3ffacbd1