[midPoint-git] [Evolveum/midpoint] 847439: Cosmetic change.

Petr Gašparík petr at gasparik.cz
Tue Jun 27 22:01:45 CEST 2017


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 847439711541fbc0b48180bf9de154cf06f8ef07
      https://github.com/Evolveum/midpoint/commit/847439711541fbc0b48180bf9de154cf06f8ef07
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java

  Log Message:
  -----------
  Cosmetic change.


  Commit: 4916426e4620f778b79e1fca385c9038ff59bab9
      https://github.com/Evolveum/midpoint/commit/4916426e4620f778b79e1fca385c9038ff59bab9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

  Log Message:
  -----------
  Some tests for assignmentPath/conflictingPath on role exclusion.


  Commit: c3da346829ed12aef6742d9a05d5b8e11b4ccbc8
      https://github.com/Evolveum/midpoint/commit/c3da346829ed12aef6742d9a05d5b8e11b4ccbc8
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java

  Log Message:
  -----------
  fixing saving lastScanTimestamp for validity scanner


  Commit: 688a503997bcd72f0502728f3d4bcf0cead1e055
      https://github.com/Evolveum/midpoint/commit/688a503997bcd72f0502728f3d4bcf0cead1e055
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    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/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties

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


  Commit: 9277a4828d97fec4a23c5087f6a6db02becdb220
      https://github.com/Evolveum/midpoint/commit/9277a4828d97fec4a23c5087f6a6db02becdb220
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java

  Log Message:
  -----------
  unassign members action fix for governance tab


  Commit: 10de75f521defa13d48d6e940bd5adbe8ce781db
      https://github.com/Evolveum/midpoint/commit/10de75f521defa13d48d6e940bd5adbe8ce781db
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaTriple.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalOperationClasses.java
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/ShortDumpable.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/velocity/VelocityScriptEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.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/TestNotifications.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPersona.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    M model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/common/role-red-sailor.xml
    M model/model-intest/src/test/resources/common/role-sailor.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportManager.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/TestUserChangeApprovalLegacy.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionVariables.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ItemDeltaItem.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/CountingInspector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousRole.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java
    M testing/story/src/test/resources/logback-test.xml
    M testing/story/src/test/resources/notorious/org-notorious.xml
    A testing/story/src/test/resources/notorious/org-supernotorious.xml
    M testing/story/src/test/resources/notorious/role-notorious.xml

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


  Commit: 355613f021b3ea6d36667822fb17831e379684fe
      https://github.com/Evolveum/midpoint/commit/355613f021b3ea6d36667822fb17831e379684fe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java

  Log Message:
  -----------
  Distinguishing newly added from pre-existing assignments for "conflicts" page.


  Commit: 460590e1f16b8954b37955ee867e390015e14099
      https://github.com/Evolveum/midpoint/commit/460590e1f16b8954b37955ee867e390015e14099
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportManager.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: e95000c8c75a34ba71daba9d0d40c599242c4580
      https://github.com/Evolveum/midpoint/commit/e95000c8c75a34ba71daba9d0d40c599242c4580
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/queryconvertor/test365RefTwoWay.xml

  Log Message:
  -----------
  Fixed MID-3974: allowing multiple reference values when parsing ref filters


  Commit: 5c37b8f5f9e4e05dbaceae17db8af55e4a314656
      https://github.com/Evolveum/midpoint/commit/5c37b8f5f9e4e05dbaceae17db8af55e4a314656
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java

  Log Message:
  -----------
  add new object button fix


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/queryconvertor/test365RefTwoWay.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

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


  Commit: 5a345bbe052f5b5b466de3bd10708f0cd72166c2
      https://github.com/Evolveum/midpoint/commit/5a345bbe052f5b5b466de3bd10708f0cd72166c2
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java

  Log Message:
  -----------
  add new object button fix


  Commit: 679ba5e5dcb11163b238ec54f66d6e0a3d44950a
      https://github.com/Evolveum/midpoint/commit/679ba5e5dcb11163b238ec54f66d6e0a3d44950a
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java

  Log Message:
  -----------
  reverting back add new object button visibility


  Commit: 7806bcce85d0a3b19a61b0590c098b7628d9c39c
      https://github.com/Evolveum/midpoint/commit/7806bcce85d0a3b19a61b0590c098b7628d9c39c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java

  Log Message:
  -----------
  "isAssignment" attribute in XML version of assignment path.


  Commit: be46704a0568a0daec335a282e4a8576308f57e4
      https://github.com/Evolveum/midpoint/commit/be46704a0568a0daec335a282e4a8576308f57e4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordAccountDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  fixing MID-3725


  Commit: 9dc240bad0bac41ee54ac745e5082d6f7fbb621c
      https://github.com/Evolveum/midpoint/commit/9dc240bad0bac41ee54ac745e5082d6f7fbb621c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/queryconvertor/test365RefTwoWay.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

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


  Commit: f159d1a368b9e65a4dfd899ffc3e5ca7dfff4720
      https://github.com/Evolveum/midpoint/commit/f159d1a368b9e65a4dfd899ffc3e5ca7dfff4720
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

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

  Log Message:
  -----------
  localization update


  Commit: 128659ad961708f27411eb56599dffa055a622c9
      https://github.com/Evolveum/midpoint/commit/128659ad961708f27411eb56599dffa055a622c9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-force-password-change.json
    A testing/rest/src/test/resources/req/xml/modification-force-password-change.xml
    A testing/rest/src/test/resources/req/yaml/modification-force-password-change.yml

  Log Message:
  -----------
  addins forceChange to the schema for credentials... added sample test for modification this attribute (REST API)


  Commit: 428738704acd6a196dd214fc4ad5ccc44a78e9b7
      https://github.com/Evolveum/midpoint/commit/428738704acd6a196dd214fc4ad5ccc44a78e9b7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java

  Log Message:
  -----------
  Some logging related to recordOperationExecution.


  Commit: 0fef77be1cbf40056234d94015093d1efe1ed867
      https://github.com/Evolveum/midpoint/commit/0fef77be1cbf40056234d94015093d1efe1ed867
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java

  Log Message:
  -----------
  Fixed 'Task errors' for multithreaded tasks (MID-3962).


  Commit: 45aa8c6289c11a6227f49a0d48c2c87b47447dbc
      https://github.com/Evolveum/midpoint/commit/45aa8c6289c11a6227f49a0d48c2c87b47447dbc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordAccountDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-force-password-change.json
    A testing/rest/src/test/resources/req/xml/modification-force-password-change.xml
    A testing/rest/src/test/resources/req/yaml/modification-force-password-change.yml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: b914ed7426135abfac17ba2498254778e0a2d587
      https://github.com/Evolveum/midpoint/commit/b914ed7426135abfac17ba2498254778e0a2d587
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java

  Log Message:
  -----------
  Added missing localization keys for wf related audit properties (MID-3799.2)


  Commit: 14435e5a8abdf27bef5f4dfd316a33f57499b8d5
      https://github.com/Evolveum/midpoint/commit/14435e5a8abdf27bef5f4dfd316a33f57499b8d5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java

  Log Message:
  -----------
  fixing MID-3540 - adding projection as a default variable for scripts.


  Commit: 3fc5436939e41f8c566a384d9eec9dd2b2bae02f
      https://github.com/Evolveum/midpoint/commit/3fc5436939e41f8c566a384d9eec9dd2b2bae02f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java

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


  Commit: 9638a7e09d0cb4e13d8700cdd18dbf80d6e346ab
      https://github.com/Evolveum/midpoint/commit/9638a7e09d0cb4e13d8700cdd18dbf80d6e346ab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java

  Log Message:
  -----------
  Possible fix for falsely positive "Attempt to set more than one value for single-valued attribute" exception


  Commit: 63bab824afac6df6504a057e806bc999e9aa71b6
      https://github.com/Evolveum/midpoint/commit/63bab824afac6df6504a057e806bc999e9aa71b6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: afd360b53b4c9649bf4c2f8ecf5e0f5a3dec8d1e
      https://github.com/Evolveum/midpoint/commit/afd360b53b4c9649bf4c2f8ecf5e0f5a3dec8d1e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ReportCreateHandlerPanel.java

  Log Message:
  -----------
  fixing MID-3340 and MID-3917


  Commit: 175afc82800a384d2e2eac06866f97d1615da906
      https://github.com/Evolveum/midpoint/commit/175afc82800a384d2e2eac06866f97d1615da906
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java

  Log Message:
  -----------
  Fixed MID-3979: The operation would result in 0 assignees


  Commit: 18e39cec142d9d3937b2c8ec5ed793fe6e874665
      https://github.com/Evolveum/midpoint/commit/18e39cec142d9d3937b2c8ec5ed793fe6e874665
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DisplayableValueChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  fix for MID-3972 (dropdown/enum for prism generated forms)


  Commit: 3f0b942841e55a0942191c34c7ed83ffb13df8c3
      https://github.com/Evolveum/midpoint/commit/3f0b942841e55a0942191c34c7ed83ffb13df8c3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/TestingPaths.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/CountingInspector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

  Log Message:
  -----------
  Fixing aggressive idempotency (a.k.a. "the parentOrgRef problem")


  Commit: 373e49b0db5158a2a6b1963c1de58d11f0ba519f
      https://github.com/Evolveum/midpoint/commit/373e49b0db5158a2a6b1963c1de58d11f0ba519f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3976 resource list


  Commit: b767bea02d686eeec67dfeeee7e42ac6d3e4a3bd
      https://github.com/Evolveum/midpoint/commit/b767bea02d686eeec67dfeeee7e42ac6d3e4a3bd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

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

  Log Message:
  -----------
  javadoc for GetOperationOptions


  Commit: 113ff581b6b34eaff344bae6c5ea70b6fa4e9d52
      https://github.com/Evolveum/midpoint/commit/113ff581b6b34eaff344bae6c5ea70b6fa4e9d52
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/TestingPaths.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    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/BaseEvent.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/CountingInspector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

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


  Commit: 63d7627824a020ccc22312d8b0fa7fbfdfdc2765
      https://github.com/Evolveum/midpoint/commit/63d7627824a020ccc22312d8b0fa7fbfdfdc2765
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousRole.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

  Log Message:
  -----------
  Fixing role idempotence again: correct handling of relations


  Commit: be27845183a1d437b187f3f3bc3b127eec052f31
      https://github.com/Evolveum/midpoint/commit/be27845183a1d437b187f3f3bc3b127eec052f31
  Author: Ivan Noris <ivan.noris at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    A samples/resources/csv/midpoint-groups.csv
    A samples/resources/csv/resource-csv-groups.xml
    A samples/resources/csv/role-csvfile-groups-account.xml
    A samples/resources/csv/role-csvfile-groups-basic-groups.xml

  Log Message:
  -----------
  Sample for CSV connector and groups (simulated by attribute). Basically clone from deprecated CSVFile connector setup.


  Commit: e6588be861e0f0e893e2fad9a2c6335c8159c738
      https://github.com/Evolveum/midpoint/commit/e6588be861e0f0e893e2fad9a2c6335c8159c738
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java

  Log Message:
  -----------
  fixign MID-3846 #2 and MID-3973  date field validation


  Commit: 456b8e7fd75ec0d6a4d9ee661528a0cc6aaec192
      https://github.com/Evolveum/midpoint/commit/456b8e7fd75ec0d6a4d9ee661528a0cc6aaec192
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A samples/resources/csv/midpoint-groups.csv
    A samples/resources/csv/resource-csv-groups.xml
    A samples/resources/csv/role-csvfile-groups-account.xml
    A samples/resources/csv/role-csvfile-groups-basic-groups.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousRole.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

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


  Commit: 24004f9ed9aa4cdef4de9002a8bfc892b1b13a56
      https://github.com/Evolveum/midpoint/commit/24004f9ed9aa4cdef4de9002a8bfc892b1b13a56
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-assignment.xml
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-modification.xml

  Log Message:
  -----------
  Fixed MID-3799.11: Disabling "create campaign" for ad-hoc cert. definitions


  Commit: d3e695cd106a731cd81e7c3aa01b0b98f0bab634
      https://github.com/Evolveum/midpoint/commit/d3e695cd106a731cd81e7c3aa01b0b98f0bab634
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 121a084eb4012a59c5ae7ea66ea5b28e3e0dc34e
      https://github.com/Evolveum/midpoint/commit/121a084eb4012a59c5ae7ea66ea5b28e3e0dc34e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java

  Log Message:
  -----------
  fixing MID-3157


  Commit: 87c7fe6c9758bd6adbdb3fe791e33734eaa80351
      https://github.com/Evolveum/midpoint/commit/87c7fe6c9758bd6adbdb3fe791e33734eaa80351
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-assignment.xml
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-modification.xml

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


  Commit: 5f8bf1fc7f108974277ba25d0b726ecdb622fb1f
      https://github.com/Evolveum/midpoint/commit/5f8bf1fc7f108974277ba25d0b726ecdb622fb1f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M build-system/pom.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java

  Log Message:
  -----------
  Switching master to latest ConnId framework.


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ConflictDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

  Log Message:
  -----------
  fix for MID-3943 (request roles which are in the conflict) + code refactoring


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

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DisplayableValueChoiceRenderer.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/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordAccountDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ReportCreateHandlerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/TestingPaths.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-assignment.xml
    M model/certification-impl/src/test/resources/adhoc/adhoc-certification-modification.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    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/BaseEvent.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A samples/resources/csv/midpoint-groups.csv
    A samples/resources/csv/resource-csv-groups.xml
    A samples/resources/csv/role-csvfile-groups-account.xml
    A samples/resources/csv/role-csvfile-groups-basic-groups.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/req/json/modification-force-password-change.json
    A testing/rest/src/test/resources/req/xml/modification-force-password-change.xml
    A testing/rest/src/test/resources/req/yaml/modification-force-password-change.yml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/CountingInspector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousRole.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

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


  Commit: d1d3011ca32e12789e473bae822521ad575cb098
      https://github.com/Evolveum/midpoint/commit/d1d3011ca32e12789e473bae822521ad575cb098
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  Fixing duplicated changes in connectors (MID-3964)


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java

  Log Message:
  -----------
  fix for MID-3983 (added distinct operation option for members tab role edit page)


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  code clean-up


  Commit: de09982a2eab034609e1e7e4550975843b750011
      https://github.com/Evolveum/midpoint/commit/de09982a2eab034609e1e7e4550975843b750011
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java

  Log Message:
  -----------
  Fixing LDAP conntests


  Commit: b1b576b4c7d4ce6aa3a97a9920676da5f85ed2d9
      https://github.com/Evolveum/midpoint/commit/b1b576b4c7d4ce6aa3a97a9920676da5f85ed2d9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

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


  Commit: 13c1623fdf65c8ceeca753e81d7824ec63a06221
      https://github.com/Evolveum/midpoint/commit/13c1623fdf65c8ceeca753e81d7824ec63a06221
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3981


  Commit: 3faa7fb1f7182bbf082a174bd7486af0de79c3d0
      https://github.com/Evolveum/midpoint/commit/3faa7fb1f7182bbf082a174bd7486af0de79c3d0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

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

  Log Message:
  -----------
  autorefresh for created report (task details) (MID-3917)


  Commit: cbc7fd8f6b8deead44ca90c1d90d6102b281ac00
      https://github.com/Evolveum/midpoint/commit/cbc7fd8f6b8deead44ca90c1d90d6102b281ac00
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java

  Log Message:
  -----------
  fixing MID-3883 (updated hmtl)


  Commit: ecd54a3eb7003eb2c5b8cfa656cbffa6e10260f6
      https://github.com/Evolveum/midpoint/commit/ecd54a3eb7003eb2c5b8cfa656cbffa6e10260f6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java

  Log Message:
  -----------
  fixing MID-3681


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java

  Log Message:
  -----------
  fix for search panel on the role catalog page


  Commit: 24eb9178333a380ecd884ae9e218114081a90e09
      https://github.com/Evolveum/midpoint/commit/24eb9178333a380ecd884ae9e218114081a90e09
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneItemLinePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ReportCreateHandlerPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java

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


  Commit: 9d93c2e8e32e65e76440bb2e511cbc00711dacf3
      https://github.com/Evolveum/midpoint/commit/9d93c2e8e32e65e76440bb2e511cbc00711dacf3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.java

  Log Message:
  -----------
  Request a role tab is removed + code clean up


  Commit: 1630741a270f2fc5db23a01f6d3bab92ca0ab5e5
      https://github.com/Evolveum/midpoint/commit/1630741a270f2fc5db23a01f6d3bab92ca0ab5e5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java

  Log Message:
  -----------
  added nodeRef to reportOutput


  Commit: 8a7096ebda175a7fe37234ec8023e80e996f296d
      https://github.com/Evolveum/midpoint/commit/8a7096ebda175a7fe37234ec8023e80e996f296d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.java

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


  Commit: 67b1aad3a206c938072c30f0cfd4066f432d0b5d
      https://github.com/Evolveum/midpoint/commit/67b1aad3a206c938072c30f0cfd4066f432d0b5d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectValue.java

  Log Message:
  -----------
  Roughly fixed MID-3956: cert. definition attributes not editable in GUI are not stripped away: deadline rounding, stopReviewOn, advanceToNextStageOn, timedActions.


  Commit: 3b728222615446e09d04f0929ca58f8563b8d31a
      https://github.com/Evolveum/midpoint/commit/3b728222615446e09d04f0929ca58f8563b8d31a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RequestAssignmentTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 4be7891eb3ddf434d945fae027785a11c26dbbbe
      https://github.com/Evolveum/midpoint/commit/4be7891eb3ddf434d945fae027785a11c26dbbbe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3620


  Commit: f63f5e96dbb98eb177c92b4e5f48023ad8f03727
      https://github.com/Evolveum/midpoint/commit/f63f5e96dbb98eb177c92b4e5f48023ad8f03727
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectValue.java

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


  Commit: 552cbacb344a197cb26d5c7b93111a696143f69d
      https://github.com/Evolveum/midpoint/commit/552cbacb344a197cb26d5c7b93111a696143f69d
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java

  Log Message:
  -----------
  MID-3619 fix


  Commit: 181f2aab402eb472d2035b2c6dd47509f836a31f
      https://github.com/Evolveum/midpoint/commit/181f2aab402eb472d2035b2c6dd47509f836a31f
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/DefinitionScopeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/StageDefinitionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectValue.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java

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


  Commit: de47ed4e93fe9fdd48ada250c45aa548d9a51c64
      https://github.com/Evolveum/midpoint/commit/de47ed4e93fe9fdd48ada250c45aa548d9a51c64
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

  Log Message:
  -----------
  Tests for full shadow loading (MID-3674)


  Commit: 712fa9d5ed4d69c0671f226cba520cc25e2105e5
      https://github.com/Evolveum/midpoint/commit/712fa9d5ed4d69c0671f226cba520cc25e2105e5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java

  Log Message:
  -----------
  Tentative fix for MID-3799.6 (NPE when task does not exist)


  Commit: 0b72fcf6a74da9ba7033163699fec561812a27ef
      https://github.com/Evolveum/midpoint/commit/0b72fcf6a74da9ba7033163699fec561812a27ef
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 2be9bb8219589978b122dff331541717ad91aa67
      https://github.com/Evolveum/midpoint/commit/2be9bb8219589978b122dff331541717ad91aa67
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  MID-3629 fix (Org tree, display object types of type shadow goes to 500 error page)


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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

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


  Commit: 64bf0b219179673e484422e0ed83b9c46cce7061
      https://github.com/Evolveum/midpoint/commit/64bf0b219179673e484422e0ed83b9c46cce7061
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  fixing MID-3456


  Commit: 9fb678888708466c45b99f750aee3442137bf208
      https://github.com/Evolveum/midpoint/commit/9fb678888708466c45b99f750aee3442137bf208
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    A model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M testing/conntest/src/test/resources/edir/resource-deimos.xml

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


  Commit: 6a58a4e23c7c4d3ed7489092a633e1390136a8ba
      https://github.com/Evolveum/midpoint/commit/6a58a4e23c7c4d3ed7489092a633e1390136a8ba
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.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/rbac/TestSegregationOfDuties.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

  Log Message:
  -----------
  Policy rules with multiple constraints - AND (MID-3959)


  Commit: bf30c2a209dd9abb52413a65bdff3b159b8cc0f1
      https://github.com/Evolveum/midpoint/commit/bf30c2a209dd9abb52413a65bdff3b159b8cc0f1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
    M model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/lens/password-policy-history.xml
    M model/model-impl/src/test/resources/lens/password-policy-no-history.xml

  Log Message:
  -----------
  test for MID-3868 -looks like everything is working correctly..


  Commit: 89a830ca4c0bcb00f1b47e25f77f5012b7023674
      https://github.com/Evolveum/midpoint/commit/89a830ca4c0bcb00f1b47e25f77f5012b7023674
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.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/rbac/TestSegregationOfDuties.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml

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


  Commit: b916f9e9c9a4b847b32bdfacd58b767599ef48f7
      https://github.com/Evolveum/midpoint/commit/b916f9e9c9a4b847b32bdfacd58b767599ef48f7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml

  Log Message:
  -----------
  Enabling tests for lifecycle and roleMembershipRef (MID-3741)


  Commit: 8f25eeced8315b304549e0a8638a85aced5f6b05
      https://github.com/Evolveum/midpoint/commit/8f25eeced8315b304549e0a8638a85aced5f6b05
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Variable 'operation' in user template (MID-3992)


  Commit: 5f78b9163ceaf3a503b76389f8f3e6183d97371c
      https://github.com/Evolveum/midpoint/commit/5f78b9163ceaf3a503b76389f8f3e6183d97371c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java

  Log Message:
  -----------
  More robust lens context unmarstalling (MID-3865)


  Commit: 110f492c5f89245959bb684492387ec667e9425b
      https://github.com/Evolveum/midpoint/commit/110f492c5f89245959bb684492387ec667e9425b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    A model/model-intest/src/test/resources/strange/role-idiot-assignment.xml
    A model/model-intest/src/test/resources/strange/role-recursion-assignment.xml
    A model/model-intest/src/test/resources/strange/role-stupid-assignment.xml

  Log Message:
  -----------
  More test for circular assignments (MID-3652)


  Commit: 9a9e692c36991fe040954ef66583386221359652
      https://github.com/Evolveum/midpoint/commit/9a9e692c36991fe040954ef66583386221359652
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

  Log Message:
  -----------
  tests for MID-3682, seems that everything works as expected..imrpvoing logging, assert refined schema for password policy


  Commit: a0728c18b972290a1b1c099e57c227b3a053bcbf
      https://github.com/Evolveum/midpoint/commit/a0728c18b972290a1b1c099e57c227b3a053bcbf
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/strange/role-idiot-assignment.xml
    A model/model-intest/src/test/resources/strange/role-recursion-assignment.xml
    A model/model-intest/src/test/resources/strange/role-stupid-assignment.xml

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


  Commit: aef6ab450647dd95529d8b2f83ee13758cc314d4
      https://github.com/Evolveum/midpoint/commit/aef6ab450647dd95529d8b2f83ee13758cc314d4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/workflow-impl/src/test/resources/policy/metarole-prune-test2x-roles.xml

  Log Message:
  -----------
  Fixing workflow test after policy rule constraint processing change


  Commit: e1fe555672b64faacf0554203898f37b1558a481
      https://github.com/Evolveum/midpoint/commit/e1fe555672b64faacf0554203898f37b1558a481
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml

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


  Commit: cd2e63f39c694402949ba1d8080ec4abba7800ef
      https://github.com/Evolveum/midpoint/commit/cd2e63f39c694402949ba1d8080ec4abba7800ef
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Fixed MID-3799.9: when opening already-closed work item, more user friendly message is shown.


  Commit: 1e0c727477924821c535b84a9c90e9094e96a640
      https://github.com/Evolveum/midpoint/commit/1e0c727477924821c535b84a9c90e9094e96a640
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
    M model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/lens/password-policy-history.xml
    M model/model-impl/src/test/resources/lens/password-policy-no-history.xml
    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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.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/rbac/TestSegregationOfDuties.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
    M model/model-intest/src/test/resources/rbac/role-meta-color.xml
    A model/model-intest/src/test/resources/strange/role-idiot-assignment.xml
    A model/model-intest/src/test/resources/strange/role-recursion-assignment.xml
    A model/model-intest/src/test/resources/strange/role-stupid-assignment.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/resources/policy/metarole-prune-test2x-roles.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 613efca4560037bc3ec1035b4e1fc2816ba2b450
      https://github.com/Evolveum/midpoint/commit/613efca4560037bc3ec1035b4e1fc2816ba2b450
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    M model/certification-impl/src/test/resources/sod/a-test-2c.xml

  Log Message:
  -----------
  Fixing SoD certification tests


  Commit: 4b614fe1e628590f6535e67b3cd69e4f019e0f8c
      https://github.com/Evolveum/midpoint/commit/4b614fe1e628590f6535e67b3cd69e4f019e0f8c
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html

  Log Message:
  -----------
  delete button fix


  Commit: 7729e013d0e3cc2dfbe9a24a13e75c94dee0a214
      https://github.com/Evolveum/midpoint/commit/7729e013d0e3cc2dfbe9a24a13e75c94dee0a214
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    M model/certification-impl/src/test/resources/sod/a-test-2c.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicyProcessor.java
    M model/model-impl/src/test/resources/common/security-policy.xml
    M model/model-impl/src/test/resources/lens/password-policy-history.xml
    M model/model-impl/src/test/resources/lens/password-policy-no-history.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
    A model/model-intest/src/test/resources/strange/role-idiot-assignment.xml
    A model/model-intest/src/test/resources/strange/role-recursion-assignment.xml
    A model/model-intest/src/test/resources/strange/role-stupid-assignment.xml
    M model/workflow-impl/src/test/resources/policy/metarole-prune-test2x-roles.xml

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


  Commit: 3fb064fcd93afd702599980bc793d073cc16aa07
      https://github.com/Evolveum/midpoint/commit/3fb064fcd93afd702599980bc793d073cc16aa07
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

  Log Message:
  -----------
  some fix for conflicting assignments (the global policy rule use case is not fixed yet)


  Commit: a48abc3785d175d12b9c9ec1acbb839fb070f00b
      https://github.com/Evolveum/midpoint/commit/a48abc3785d175d12b9c9ec1acbb839fb070f00b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java

  Log Message:
  -----------
  Fixed "isWarning" calculation for conflicts in shopping cart.


  Commit: 1c2ed021a7fcf88f0ce29fdf9b42eae2905fecff
      https://github.com/Evolveum/midpoint/commit/1c2ed021a7fcf88f0ce29fdf9b42eae2905fecff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInStage.java

  Log Message:
  -----------
  Possible fix for MID-3799.8 (race condition when approving work items)


  Commit: 664a61f15a236970dac1636d6ebb740df5cf4dbf
      https://github.com/Evolveum/midpoint/commit/664a61f15a236970dac1636d6ebb740df5cf4dbf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

  Log Message:
  -----------
  An attempt to resolve warning/error problems (TODO review this)


  Commit: 8eae163bcba499b25aac92edea7359f1508f64dd
      https://github.com/Evolveum/midpoint/commit/8eae163bcba499b25aac92edea7359f1508f64dd
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java

  Log Message:
  -----------
  MID-3687 fix (Setting target as shadow at audit log results into NPE)


  Commit: df34ef5681120b4d98645fe1944ae94aa39cf4d6
      https://github.com/Evolveum/midpoint/commit/df34ef5681120b4d98645fe1944ae94aa39cf4d6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointLdapAuthenticationProvider.java

  Log Message:
  -----------
  fixing MID-3631 adn MID-3788


  Commit: d29c9a4df460a9110a4a9369e19f33476015bf66
      https://github.com/Evolveum/midpoint/commit/d29c9a4df460a9110a4a9369e19f33476015bf66
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidPointLdapAuthenticationProvider.java

  Log Message:
  -----------
  moving to correct project


  Commit: f85586ab3c54a8dd90b8b7dbd42dacb6450f793c
      https://github.com/Evolveum/midpoint/commit/f85586ab3c54a8dd90b8b7dbd42dacb6450f793c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointLdapAuthenticationProvider.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-ldap.xml

  Log Message:
  -----------
  spring security ctx.


  Commit: 311d5b24a1d95ec569a3c973387e0d835c2750f9
      https://github.com/Evolveum/midpoint/commit/311d5b24a1d95ec569a3c973387e0d835c2750f9
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInStage.java

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


  Commit: 9934666c1afa0a1d047bed3f1e8d31a7a959393c
      https://github.com/Evolveum/midpoint/commit/9934666c1afa0a1d047bed3f1e8d31a7a959393c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    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/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/role-minister.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Better SoD tests with global policy rules


  Commit: be06d3addf0990c1329ac7aa188ee4f3d6d10c1f
      https://github.com/Evolveum/midpoint/commit/be06d3addf0990c1329ac7aa188ee4f3d6d10c1f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
    M model/certification-impl/src/test/resources/common/role-eroot-user-assignment-campaign-owner.xml

  Log Message:
  -----------
  Fixed the test (MID-3878)


  Commit: 562b0f8a0a6fac399fff88d4ee585d77c3b1b236
      https://github.com/Evolveum/midpoint/commit/562b0f8a0a6fac399fff88d4ee585d77c3b1b236
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-ldap.xml
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidPointLdapAuthenticationProvider.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/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/role-minister.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 34c4ae42975509ae41b15b069135c85586cecf8b
      https://github.com/Evolveum/midpoint/commit/34c4ae42975509ae41b15b069135c85586cecf8b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java

  Log Message:
  -----------
  Fixing wstest compilation problems


  Commit: 108ac2b6d14351dfd8a08a5a35d72da1760563ff
      https://github.com/Evolveum/midpoint/commit/108ac2b6d14351dfd8a08a5a35d72da1760563ff
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Keeping node OID + fixed MID-3155.5


  Commit: 3be3a18f9ba4ede8381927a029f8095ba4a8b03f
      https://github.com/Evolveum/midpoint/commit/3be3a18f9ba4ede8381927a029f8095ba4a8b03f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 85a2d89850c0933ef6cc8be38886f8e93db91847
      https://github.com/Evolveum/midpoint/commit/85a2d89850c0933ef6cc8be38886f8e93db91847
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java

  Log Message:
  -----------
  Fixing Medusa conntests


  Commit: a8c1fd7e0b81b1cf3036b797c457fa2b410e68e0
      https://github.com/Evolveum/midpoint/commit/a8c1fd7e0b81b1cf3036b797c457fa2b410e68e0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Increasing max memory for the tests


  Commit: 5a9c98589b41580d5eb78f66e04be5464a6083aa
      https://github.com/Evolveum/midpoint/commit/5a9c98589b41580d5eb78f66e04be5464a6083aa
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  MID-3915 (Report "Users in midPoint" doesn't show any results if...)


  Commit: 22893d7b5eed1e7a08fe1054baa90a478d9cb03d
      https://github.com/Evolveum/midpoint/commit/22893d7b5eed1e7a08fe1054baa90a478d9cb03d
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security-ldap.xml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
    M model/certification-impl/src/test/resources/common/role-eroot-user-assignment-campaign-owner.xml
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidPointLdapAuthenticationProvider.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/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/role-minister.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java

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


  Commit: c54bc1c51a35ed91d26e567ecc273aa562acddf1
      https://github.com/Evolveum/midpoint/commit/c54bc1c51a35ed91d26e567ecc273aa562acddf1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/TestModelServiceContract.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/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    A model/model-intest/src/test/resources/security/role-read-self-modify-orgunit.xml
    A model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing processing of assign and unassign authorizations +tests (MID-3996)


  Commit: 1c0040764d4da949f53b79e3972d4eb53d0b6cb6
      https://github.com/Evolveum/midpoint/commit/1c0040764d4da949f53b79e3972d4eb53d0b6cb6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java

  Log Message:
  -----------
  Minor test cleanup


  Commit: 523e53c5b7d0d1a01476e7d66c1ecf2485041f39
      https://github.com/Evolveum/midpoint/commit/523e53c5b7d0d1a01476e7d66c1ecf2485041f39
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.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/TestMisc.java
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

  Log Message:
  -----------
  Tests for binary extension property (MID-3999). Better repo error message.


  Commit: 0149563171c6ee8ab153a29d6a725083129ecf0a
      https://github.com/Evolveum/midpoint/commit/0149563171c6ee8ab153a29d6a725083129ecf0a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractAjaxDownloadBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  fixing MID-3993


  Commit: e561853a640043023b759b4cf759c2838746dc69
      https://github.com/Evolveum/midpoint/commit/e561853a640043023b759b4cf759c2838746dc69
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.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/page/admin/certification/PageCertCampaigns.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
    M model/certification-impl/src/test/resources/common/role-eroot-user-assignment-campaign-owner.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.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/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    A model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/role-minister.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    A model/model-intest/src/test/resources/security/role-read-self-modify-orgunit.xml
    A model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java

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


  Commit: c300dce71395721da7d08e0a4980104f7ab39b9e
      https://github.com/Evolveum/midpoint/commit/c300dce71395721da7d08e0a4980104f7ab39b9e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.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/TestPasswordDefault.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    A model/model-intest/src/test/resources/common/password-policy-benevolent.xml
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml

  Log Message:
  -----------
  Fixing bad error criticality evaluation (MID-3682)


  Commit: 72de3ef48c463f683cb8bbe73dc59af1ed02b620
      https://github.com/Evolveum/midpoint/commit/72de3ef48c463f683cb8bbe73dc59af1ed02b620
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Longer storytest timeouts


  Commit: d5eaef05e37cc82c15aa001c3d9dd934fcff4aa8
      https://github.com/Evolveum/midpoint/commit/d5eaef05e37cc82c15aa001c3d9dd934fcff4aa8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/HookRegistry.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/HookRegistryImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/assignments/role-role24-approval-and-enforce.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml
    A model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
    A model/workflow-impl/src/test/resources/policy/user-lead15.xml

  Log Message:
  -----------
  Fixed MID-3836: Enforcement does not like being combined with WF


  Commit: be7797aab59ebe8c06356e7b95541b4e15fcf54f
      https://github.com/Evolveum/midpoint/commit/be7797aab59ebe8c06356e7b95541b4e15fcf54f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.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/TestPasswordDefault.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    A model/model-intest/src/test/resources/common/password-policy-benevolent.xml
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 73a95a86f6186008332ea405f38eb5caf50e3e11
      https://github.com/Evolveum/midpoint/commit/73a95a86f6186008332ea405f38eb5caf50e3e11
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java

  Log Message:
  -----------
  Fixed wf tests.


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  ui authorizations for elements (menu items, csv export button)


  Commit: 5990c5371dbbf81aaa34acf8f0d4867dc61c1409
      https://github.com/Evolveum/midpoint/commit/5990c5371dbbf81aaa34acf8f0d4867dc61c1409
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractAjaxDownloadBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/HookRegistry.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/HookRegistryImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.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/TestPasswordDefault.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.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/TestSecurityAdvanced.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
    A model/model-intest/src/test/resources/common/password-policy-benevolent.xml
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    A model/model-intest/src/test/resources/security/role-read-self-modify-orgunit.xml
    A model/model-intest/src/test/resources/security/user-template-security.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/resources/policy/assignments/role-role24-approval-and-enforce.xml
    A model/workflow-impl/src/test/resources/policy/assignments/user-lead24.xml
    A model/workflow-impl/src/test/resources/policy/role-role15.xml
    M model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
    A model/workflow-impl/src/test/resources/policy/user-lead15.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java


  Commit: 46401d3df7ea7e52378576ac86fef69cc51f71d3
      https://github.com/Evolveum/midpoint/commit/46401d3df7ea7e52378576ac86fef69cc51f71d3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  csv export button visibility


  Commit: 2c52617762685f42b2d3ab806dff8ae057aa7f5a
      https://github.com/Evolveum/midpoint/commit/2c52617762685f42b2d3ab806dff8ae057aa7f5a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java

  Log Message:
  -----------
  fixing MID-3985 and MID-4000


  Commit: cde3d1d741afc39f51cb78447b7a505e885edf69
      https://github.com/Evolveum/midpoint/commit/cde3d1d741afc39f51cb78447b7a505e885edf69
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    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
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java

  Log Message:
  -----------
  Fixing add operation for semi-manual resources (MID-4002)


  Commit: fd6eaf1fdd8077f67107ad914be759226074464b
      https://github.com/Evolveum/midpoint/commit/fd6eaf1fdd8077f67107ad914be759226074464b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    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/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.java

  Log Message:
  -----------
  Another attempt at MID-3249 (Error when object has extra extension attributes in repo)

1) mis-named items are now _not_ silently dropped
2) it is now possible to fix mis-named items in raw mode (debug pages)


  Commit: 816c5814d6012414b051178337588d3e8ce5ef1c
      https://github.com/Evolveum/midpoint/commit/816c5814d6012414b051178337588d3e8ce5ef1c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    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
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 296a6523f9a2392a568f0e9bb4bd0c627f061d7b
      https://github.com/Evolveum/midpoint/commit/296a6523f9a2392a568f0e9bb4bd0c627f061d7b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

  Log Message:
  -----------
  Logging of "any" conversion in repo


  Commit: 723105a7a44ce8c0b892cb31029ae4528db4040a
      https://github.com/Evolveum/midpoint/commit/723105a7a44ce8c0b892cb31029ae4528db4040a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3884


  Commit: aae849b2b10cbb3ffd97874636c14a3933dfedcd
      https://github.com/Evolveum/midpoint/commit/aae849b2b10cbb3ffd97874636c14a3933dfedcd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java

  Log Message:
  -----------
  small improvement in auditlog viewer panel


  Commit: fc7b1c2ddd6989789dde08edcf39a330373a3096
      https://github.com/Evolveum/midpoint/commit/fc7b1c2ddd6989789dde08edcf39a330373a3096
  Author: Arnost Starosta <arnost.starosta at gmail.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  property key for extra report parameter


  Commit: d1dd74f46ca10338ab9051fc60d3514d1cd79805
      https://github.com/Evolveum/midpoint/commit/d1dd74f46ca10338ab9051fc60d3514d1cd79805
  Author: Martin Lízner <martin.lizner at gmail.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  Merge pull request #33 from arnost-starosta/report-param-property-key

property key for extra report parameter


  Commit: c0a85f7169c73521d1347798b0362152732da7ec
      https://github.com/Evolveum/midpoint/commit/c0a85f7169c73521d1347798b0362152732da7ec
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

  Log Message:
  -----------
  fixing MID-3896


  Commit: b0bcaf63fb1057a0396794e5b4405341b7bcccb1
      https://github.com/Evolveum/midpoint/commit/b0bcaf63fb1057a0396794e5b4405341b7bcccb1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java

  Log Message:
  -----------
  fixing FocusValidityTaskHanled createQuery to consider focusType defined in the task while constructing query


  Commit: 79265dc7448fdfb352a5e3944f45eabd383ce6ae
      https://github.com/Evolveum/midpoint/commit/79265dc7448fdfb352a5e3944f45eabd383ce6ae
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

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

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


  Commit: f0f90e571e19274d95921a1f452365aeab7e1995
      https://github.com/Evolveum/midpoint/commit/f0f90e571e19274d95921a1f452365aeab7e1995
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    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/TestMisc.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd

  Log Message:
  -----------
  Better tests for binary extension attributes (MID-3999)


  Commit: dd4421d5b23b8049320a3ddbe961d3acb46395dc
      https://github.com/Evolveum/midpoint/commit/dd4421d5b23b8049320a3ddbe961d3acb46395dc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-22 (Thu, 22 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ScheduleValidator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    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/sync/FocusValidityScannerTaskHandler.java

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  policy rule assignments names


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchValue.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/TextPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/ScheduleValidator.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.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/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/visualizer/TestVisualizer.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/TestMisc.java
    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
    M model/model-intest/src/test/resources/manual/resource-semi-manual.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

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

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


  Commit: 4c0815f6734d252416bfcfbbabb6f33cdfd65b53
      https://github.com/Evolveum/midpoint/commit/4c0815f6734d252416bfcfbbabb6f33cdfd65b53
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java

  Log Message:
  -----------
  fixing compilation error


  Commit: 2ed3215e475e8f0b015234cacab6fdf0f3940078
      https://github.com/Evolveum/midpoint/commit/2ed3215e475e8f0b015234cacab6fdf0f3940078
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java

  Log Message:
  -----------
  fixing MID-4004 (probably)


  Commit: 916fde13cc10f1910d329f59169d99193941f438
      https://github.com/Evolveum/midpoint/commit/916fde13cc10f1910d329f59169d99193941f438
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectTypeContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java

  Log Message:
  -----------
  Attempt to make shadow integrity checker less memory-hungry.


  Commit: 6698bbe0fac1c0a0191b17013584df3f0b25df5a
      https://github.com/Evolveum/midpoint/commit/6698bbe0fac1c0a0191b17013584df3f0b25df5a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml

  Log Message:
  -----------
  relation = org:manager changed to manager to test MID-3660


  Commit: ae46083b6a96e6247d5379f675a51af170240442
      https://github.com/Evolveum/midpoint/commit/ae46083b6a96e6247d5379f675a51af170240442
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  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:
  -----------
  fixing https://jira.evolveum.com/browse/MID-3077


  Commit: 1ca3028bf940c5d602e45f19f75778caa6ec958d
      https://github.com/Evolveum/midpoint/commit/1ca3028bf940c5d602e45f19f75778caa6ec958d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectTypeContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java

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


  Commit: 13b823b6f80133e369c767dee5a377eb01cfe7f1
      https://github.com/Evolveum/midpoint/commit/13b823b6f80133e369c767dee5a377eb01cfe7f1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    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/TestStrangeCases.java

  Log Message:
  -----------
  Adapted TestStrangeCases to changed handling of not-schema-compliant data.


  Commit: 511182bdf141b187fa5ecf2a6385d46b3ef157ec
      https://github.com/Evolveum/midpoint/commit/511182bdf141b187fa5ecf2a6385d46b3ef157ec
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: f59de3d83e756ae2f9d40f9e5feb22f540b54eba
      https://github.com/Evolveum/midpoint/commit/f59de3d83e756ae2f9d40f9e5feb22f540b54eba
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java

  Log Message:
  -----------
  Some more logging at task manager initialization.


  Commit: 2ab6d9081eaf0446825d984bb73f60f90ffd7739
      https://github.com/Evolveum/midpoint/commit/2ab6d9081eaf0446825d984bb73f60f90ffd7739
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    A samples/objects/lookup-languages-all.xml

  Log Message:
  -----------
  Languages lookup tables (MID-2298) contributed by Chris Woods


  Commit: 26fde3849b54b47c2e58059c739a12e77336d5af
      https://github.com/Evolveum/midpoint/commit/26fde3849b54b47c2e58059c739a12e77336d5af
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java

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


  Commit: 13527944362d14b9697ad74e729ddea24aa1c1b7
      https://github.com/Evolveum/midpoint/commit/13527944362d14b9697ad74e729ddea24aa1c1b7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java

  Log Message:
  -----------
  Avoiding pointless warning of 'Duplicate definition of variable {http://midpoint.evolveum.com/xml/ns/public/common/common-3}actor'


  Commit: 54db37b38f75cc7ebf6ed4ea153a30f17e6a7eec
      https://github.com/Evolveum/midpoint/commit/54db37b38f75cc7ebf6ed4ea153a30f17e6a7eec
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    A samples/objects/lookup-languages-all.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: a9aacd308a243819614e79a38285387249afcb7a
      https://github.com/Evolveum/midpoint/commit/a9aacd308a243819614e79a38285387249afcb7a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java

  Log Message:
  -----------
  Optimizing wf tasks size.

1. Model context is no longer kept after execution (i.e. it's deleted if in FINAL state)
2. Operation result in executed deltas is trimmed down to the most basic data (status, message etc) - no subresults.


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java

  Log Message:
  -----------
  MID-4006 log warning fix


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ObjectTypeContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.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/TestStrangeCases.java
    M model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    A samples/objects/lookup-languages-all.xml

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


  Commit: 034c26c439bc8db4df773ba71e539a14eac67bbd
      https://github.com/Evolveum/midpoint/commit/034c26c439bc8db4df773ba71e539a14eac67bbd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java

  Log Message:
  -----------
  fixing MID-3994  & MID-3848 preview changes


  Commit: de087083287a773cbe8c3754cf8b41086781ffbe
      https://github.com/Evolveum/midpoint/commit/de087083287a773cbe8c3754cf8b41086781ffbe
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.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/TestStrangeCases.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/LocalNodeManager.java
    A samples/objects/lookup-languages-all.xml

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


  Commit: f55ff84e7fd8e11e80405660c0cf507cade78f39
      https://github.com/Evolveum/midpoint/commit/f55ff84e7fd8e11e80405660c0cf507cade78f39
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Improving hostname and ipaddresses in node objects


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java

  Log Message:
  -----------
  MID-2473 fix


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

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

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


  Commit: 306dc769493ebf9c2b5f665f6e08ac9e8f1303bc
      https://github.com/Evolveum/midpoint/commit/306dc769493ebf9c2b5f665f6e08ac9e8f1303bc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Cosmetic changes.


  Commit: 5b82be074aae3e21a65d436f1927062075b5023f
      https://github.com/Evolveum/midpoint/commit/5b82be074aae3e21a65d436f1927062075b5023f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    R model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    R model/model-intest/src/test/resources/rbac/role-color-blue.xml
    R model/model-intest/src/test/resources/rbac/role-color-green.xml
    R model/model-intest/src/test/resources/rbac/role-color-none.xml
    R model/model-intest/src/test/resources/rbac/role-color-red.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-1.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-2.xml
    R model/model-intest/src/test/resources/rbac/role-criminal.xml
    R model/model-intest/src/test/resources/rbac/role-executive-1.xml
    R model/model-intest/src/test/resources/rbac/role-executive-2.xml
    R model/model-intest/src/test/resources/rbac/role-meta-color.xml
    R model/model-intest/src/test/resources/rbac/role-meta-controlling.xml
    R model/model-intest/src/test/resources/rbac/role-meta-executive.xml
    R model/model-intest/src/test/resources/rbac/role-minister.xml
    R model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    R model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    R model/model-intest/src/test/resources/rbac/role-prize-silver.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-color.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-controlling.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-executive.xml
    A model/model-intest/src/test/resources/rbac/sod/role-minister.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver.xml

  Log Message:
  -----------
  Minor test cleanup


  Commit: 7967075ac45c78700263e91c92da1642e0f01552
      https://github.com/Evolveum/midpoint/commit/7967075ac45c78700263e91c92da1642e0f01552
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Another reduction of task size: wf tasks (in case of no error) have all subresults stripped off.


  Commit: 594f3e09e8171062411396bd0f92594ec39ebe36
      https://github.com/Evolveum/midpoint/commit/594f3e09e8171062411396bd0f92594ec39ebe36
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    R model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    R model/model-intest/src/test/resources/rbac/role-color-blue.xml
    R model/model-intest/src/test/resources/rbac/role-color-green.xml
    R model/model-intest/src/test/resources/rbac/role-color-none.xml
    R model/model-intest/src/test/resources/rbac/role-color-red.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-1.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-2.xml
    R model/model-intest/src/test/resources/rbac/role-criminal.xml
    R model/model-intest/src/test/resources/rbac/role-executive-1.xml
    R model/model-intest/src/test/resources/rbac/role-executive-2.xml
    R model/model-intest/src/test/resources/rbac/role-meta-color.xml
    R model/model-intest/src/test/resources/rbac/role-meta-controlling.xml
    R model/model-intest/src/test/resources/rbac/role-meta-executive.xml
    R model/model-intest/src/test/resources/rbac/role-minister.xml
    R model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    R model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    R model/model-intest/src/test/resources/rbac/role-prize-silver.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-color.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-controlling.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-executive.xml
    A model/model-intest/src/test/resources/rbac/sod/role-minister.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: ef86c2d8f9a45b9fa77b771a3179fc3e85944bd4
      https://github.com/Evolveum/midpoint/commit/ef86c2d8f9a45b9fa77b771a3179fc3e85944bd4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java

  Log Message:
  -----------
  Fixed wf tests.


  Commit: f1d2a0fbd46e1840393eebcdfddf23a3c8fdae89
      https://github.com/Evolveum/midpoint/commit/f1d2a0fbd46e1840393eebcdfddf23a3c8fdae89
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java

  Log Message:
  -----------
  Fixed TestProjector.


  Commit: d21f4b75bec10d739da83fa2bdd560bd3432e039
      https://github.com/Evolveum/midpoint/commit/d21f4b75bec10d739da83fa2bdd560bd3432e039
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-compare.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/resources/rbac/role-all-loot.xml
    A model/model-intest/src/test/resources/rbac/role-all-treasure.xml
    A model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
    A model/model-intest/src/test/resources/rbac/role-loot-diamonds.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-gold.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-silver.xml

  Log Message:
  -----------
  Integration tests for dynamic roles and MID-3966


  Commit: ea7f23a23e4b5dd64717e0dca9d41164cb09810d
      https://github.com/Evolveum/midpoint/commit/ea7f23a23e4b5dd64717e0dca9d41164cb09810d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    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/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/org-indirect-pirate.xml
    A model/model-intest/src/test/resources/security/role-indirect-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Tests for focusType in authentication (MID-3650)


  Commit: 351e37e3ee94d9c5e2d89a730185342be42b9422
      https://github.com/Evolveum/midpoint/commit/351e37e3ee94d9c5e2d89a730185342be42b9422
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
    M model/certification-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Storing "primary" evaluated triggers only once for each assignment (i.e. referencing them from situation-rule triggers instead of duplicating them).


  Commit: 5fb2234ba99c8b313f0abc9f41bebfb7849154b9
      https://github.com/Evolveum/midpoint/commit/5fb2234ba99c8b313f0abc9f41bebfb7849154b9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-24 (Sat, 24 Jun 2017)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-compare.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.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/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-all-loot.xml
    A model/model-intest/src/test/resources/rbac/role-all-treasure.xml
    A model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
    A model/model-intest/src/test/resources/rbac/role-loot-diamonds.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-gold.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-silver.xml
    A model/model-intest/src/test/resources/security/org-indirect-pirate.xml
    A model/model-intest/src/test/resources/security/role-indirect-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 042f3f42ae65ba9497ee5aef067b27be0b0a5be0
      https://github.com/Evolveum/midpoint/commit/042f3f42ae65ba9497ee5aef067b27be0b0a5be0
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java

  Log Message:
  -----------
  MID-3998 fix


  Commit: 3349e196bfb421b298c9e81c6c2470276e82f239
      https://github.com/Evolveum/midpoint/commit/3349e196bfb421b298c9e81c6c2470276e82f239
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    A infra/schema/src/test/resources/diff/role-compare.xml
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
    M model/certification-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentKey.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.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/TestSecurityPrincipal.java
    M model/model-intest/src/test/resources/logback-test.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-exclusion.xml
    R model/model-intest/src/test/resources/rbac/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/role-all-loot.xml
    A model/model-intest/src/test/resources/rbac/role-all-treasure.xml
    A model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-sk.xml
    R model/model-intest/src/test/resources/rbac/role-citizen-us.xml
    R model/model-intest/src/test/resources/rbac/role-color-blue.xml
    R model/model-intest/src/test/resources/rbac/role-color-green.xml
    R model/model-intest/src/test/resources/rbac/role-color-none.xml
    R model/model-intest/src/test/resources/rbac/role-color-red.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-1.xml
    R model/model-intest/src/test/resources/rbac/role-controlling-2.xml
    R model/model-intest/src/test/resources/rbac/role-criminal.xml
    R model/model-intest/src/test/resources/rbac/role-executive-1.xml
    R model/model-intest/src/test/resources/rbac/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/role-loot-diamonds.xml
    R model/model-intest/src/test/resources/rbac/role-meta-color.xml
    R model/model-intest/src/test/resources/rbac/role-meta-controlling.xml
    R model/model-intest/src/test/resources/rbac/role-meta-executive.xml
    R model/model-intest/src/test/resources/rbac/role-minister.xml
    R model/model-intest/src/test/resources/rbac/role-prize-bronze.xml
    R model/model-intest/src/test/resources/rbac/role-prize-gold.xml
    R model/model-intest/src/test/resources/rbac/role-prize-silver.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-bronze.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-gold.xml
    A model/model-intest/src/test/resources/rbac/role-treasure-silver.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-exclusion.xml
    A model/model-intest/src/test/resources/rbac/sod/global-policy-rules-sod-approval.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-sk.xml
    A model/model-intest/src/test/resources/rbac/sod/role-citizen-us.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-blue.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-green.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-none.xml
    A model/model-intest/src/test/resources/rbac/sod/role-color-red.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-controlling-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-criminal.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-1.xml
    A model/model-intest/src/test/resources/rbac/sod/role-executive-2.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-color.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-controlling.xml
    A model/model-intest/src/test/resources/rbac/sod/role-meta-executive.xml
    A model/model-intest/src/test/resources/rbac/sod/role-minister.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver.xml
    A model/model-intest/src/test/resources/security/org-indirect-pirate.xml
    A model/model-intest/src/test/resources/security/role-indirect-pirate.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

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


  Commit: b59a0a158c593e5cb674ecbe196484906efbb009
      https://github.com/Evolveum/midpoint/commit/b59a0a158c593e5cb674ecbe196484906efbb009
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

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

  Log Message:
  -----------
  Fixed detection whether policy rules can be packed.


  Commit: 4b3e7d0c6272c67713029b528f90e6234dcfcc94
      https://github.com/Evolveum/midpoint/commit/4b3e7d0c6272c67713029b528f90e6234dcfcc94
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java

  Log Message:
  -----------
  date-time component fix


  Commit: 0746a1001c71f0ed5cafb93199a1586e79d9c03b
      https://github.com/Evolveum/midpoint/commit/0746a1001c71f0ed5cafb93199a1586e79d9c03b
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

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

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


  Commit: d81ad9ccb3a49750c421da895d525a0c15dabec1
      https://github.com/Evolveum/midpoint/commit/d81ad9ccb3a49750c421da895d525a0c15dabec1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java

  Log Message:
  -----------
  Evaluated triggers comparison was made a bit more robust (won't trigger unnecessary updates).


  Commit: 80e1f99002a5cf7e21395237f2539b394ca5881a
      https://github.com/Evolveum/midpoint/commit/80e1f99002a5cf7e21395237f2539b394ca5881a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: d91bb46b95ba131bd511f4db5727db081686fb25
      https://github.com/Evolveum/midpoint/commit/d91bb46b95ba131bd511f4db5727db081686fb25
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java

  Log Message:
  -----------
  Fixed MID-3931: Additional information for workflow item approval can't be localized


  Commit: 3e7d3b62d4a1d334a11cf9a126186a07485302da
      https://github.com/Evolveum/midpoint/commit/3e7d3b62d4a1d334a11cf9a126186a07485302da
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-26 (Mon, 26 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleVisitable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaMapTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.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/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.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/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

  Log Message:
  -----------
  Fixing password weak mappings (hashing). Update of several tests while chasing down password notification issues.


  Commit: 4434f612e9fb21089fa52af2168b0c9106b9c396
      https://github.com/Evolveum/midpoint/commit/4434f612e9fb21089fa52af2168b0c9106b9c396
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFunctionsImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java

  Log Message:
  -----------
  Fixed MID-3802: Error in log during fresh install


  Commit: 5196bf3c402a81e644e15321ca48c5a96ad85cde
      https://github.com/Evolveum/midpoint/commit/5196bf3c402a81e644e15321ca48c5a96ad85cde
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleVisitable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaMapTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.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/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.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/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: c1762f502cf061f9c65f6a6ef5b7d36a3d2ce349
      https://github.com/Evolveum/midpoint/commit/c1762f502cf061f9c65f6a6ef5b7d36a3d2ce349
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java

  Log Message:
  -----------
  (Hopefully) fixed MID-4009: NullPointer in CredentialPolicyEvaluator.validateCredentialContainerValues


  Commit: 1b8237261f49f4b288fbbbc7747d50165b7e44c3
      https://github.com/Evolveum/midpoint/commit/1b8237261f49f4b288fbbbc7747d50165b7e44c3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M infra/schema/src/test/resources/common/xml/ns/wf-context.xml

  Log Message:
  -----------
  Data for MID-4018


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java

  Log Message:
  -----------
  some improvements for assignments loading/displaying


  Commit: 714954e84c65b7016e97508d3821ade960212971
      https://github.com/Evolveum/midpoint/commit/714954e84c65b7016e97508d3821ade960212971
  Author: honchar <honchar at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleVisitable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaMapTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/schema/src/test/resources/common/xml/ns/wf-context.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialPolicyEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.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/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.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/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationFunctionsImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

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


  Commit: f2e0458a2537eb0175d472ab8ba3d77f518e3639
      https://github.com/Evolveum/midpoint/commit/f2e0458a2537eb0175d472ab8ba3d77f518e3639
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M testing/story/pom.xml

  Log Message:
  -----------
  Fixing story test dependencies.


  Commit: 549e933ba7398a5e9c1e868d7b0904748548cd3f
      https://github.com/Evolveum/midpoint/commit/549e933ba7398a5e9c1e868d7b0904748548cd3f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml

  Log Message:
  -----------
  Better tests for powerhell


  Commit: 49ee79d809ec378008af7610771726f7bcd2c3dc
      https://github.com/Evolveum/midpoint/commit/49ee79d809ec378008af7610771726f7bcd2c3dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java

  Log Message:
  -----------
  Fixed MID-4022: Couldn't get information on activiti task 420923.


  Commit: d8d763919bd3f224cb7c7aa699ef49276679cb76
      https://github.com/Evolveum/midpoint/commit/d8d763919bd3f224cb7c7aa699ef49276679cb76
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
    M testing/story/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 82fb27ba7a42f832b19599f7246b731c8ee16e06
      https://github.com/Evolveum/midpoint/commit/82fb27ba7a42f832b19599f7246b731c8ee16e06
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    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/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties

  Log Message:
  -----------
  Prerelease translation update, wait for more...


Compare: https://github.com/Evolveum/midpoint/compare/a7bfbf284bce...82fb27ba7a42


More information about the midPoint-svn mailing list