[midPoint-git] [Evolveum/midpoint] 28fcb6: some fixes for reigstration process..

Petr Gašparík petr.gasparik at ami.cz
Wed Nov 23 15:51:51 CET 2016


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 28fcb680e413b0165eb25e42050bc1c903b28ff6
      https://github.com/Evolveum/midpoint/commit/28fcb680e413b0165eb25e42050bc1c903b28ff6
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  some fixes for reigstration process..


  Commit: 840b74c9258bfdb9a5e79c1f85290a95ae90120e
      https://github.com/Evolveum/midpoint/commit/840b74c9258bfdb9a5e79c1f85290a95ae90120e
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  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/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Delegations tab


  Commit: cf98bbfdb6b3084540b9cb022885ac2013cca02b
      https://github.com/Evolveum/midpoint/commit/cf98bbfdb6b3084540b9cb022885ac2013cca02b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
    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/gui/api/util/WebModelServiceUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestUnitObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.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/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/orgstruct/org-caribbean.xml
    A model/model-intest/src/test/resources/orgstruct/role-meta-piracy-org.xml
    A model/model-intest/src/test/resources/orgstruct/user-gibbs.xml
    A model/model-intest/src/test/resources/orgstruct/user-pintel.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 1d33f3366b46526c4b1f33cb3e4586ac8b8f8c7b
      https://github.com/Evolveum/midpoint/commit/1d33f3366b46526c4b1f33cb3e4586ac8b8f8c7b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    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
    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/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java

  Log Message:
  -----------
  Looks like the order/relation is solved. (MID-3472)


  Commit: ccc5a885ee971f7316efac6b7369ed6106c412b5
      https://github.com/Evolveum/midpoint/commit/ccc5a885ee971f7316efac6b7369ed6106c412b5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

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

  Log Message:
  -----------
  Secondary identifier


  Commit: a2a9843dde3de11e7f2d36c0950d03400eb73cbf
      https://github.com/Evolveum/midpoint/commit/a2a9843dde3de11e7f2d36c0950d03400eb73cbf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Governance/compliance schema, iteration 2


  Commit: 9121f5b6fe3c5ae5aa38b84f51cd1977c709a3ae
      https://github.com/Evolveum/midpoint/commit/9121f5b6fe3c5ae5aa38b84f51cd1977c709a3ae
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-07 (Mon, 07 Nov 2016)

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

  Log Message:
  -----------
  smal improvements for self registration - preregistered user.


  Commit: 2f85062ceceeba186ec9cc240aa0c3e51ea9e4ac
      https://github.com/Evolveum/midpoint/commit/2f85062ceceeba186ec9cc240aa0c3e51ea9e4ac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java

  Log Message:
  -----------
  Fixing schema tests


  Commit: c9971e90e5074e6d0ad904e27136b11e6f46e438
      https://github.com/Evolveum/midpoint/commit/c9971e90e5074e6d0ad904e27136b11e6f46e438
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    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

  Log Message:
  -----------
  Delegable flag in abstract role


  Commit: 2c72742568ced2fd15c76537726b0a0c972fb12e
      https://github.com/Evolveum/midpoint/commit/2c72742568ced2fd15c76537726b0a0c972fb12e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

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

  Log Message:
  -----------
  MID-3507: comment about probable cause


  Commit: 50ff3a1584cca50fd929996099ca7b6ebad8e2a6
      https://github.com/Evolveum/midpoint/commit/50ff3a1584cca50fd929996099ca7b6ebad8e2a6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/MergeDeltas.java

  Log Message:
  -----------
  MergeDeltas serializable


  Commit: cf9e3f887d901db68a6cd5c02dda819fbe018e31
      https://github.com/Evolveum/midpoint/commit/cf9e3f887d901db68a6cd5c02dda819fbe018e31
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    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/security/AuthenticationEvaluatorImpl.java

  Log Message:
  -----------
  fixing npe while authenticating user with nonce


  Commit: b5deb28fb66adeaac759c76053978493edcc3015
      https://github.com/Evolveum/midpoint/commit/b5deb28fb66adeaac759c76053978493edcc3015
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-08 (Tue, 08 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java

  Log Message:
  -----------
  Fixed parsing already-parsed PolyString primitives. Fixed handling of SchemaExceptions in ObjectDeltaOperationPanel.


  Commit: 03720aa10207ec644c9538bf9638c107c7e1229f
      https://github.com/Evolveum/midpoint/commit/03720aa10207ec644c9538bf9638c107c7e1229f
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  Delegations draft


  Commit: b1fe374c02cb497d51619076c8c0ff352d6aef5d
      https://github.com/Evolveum/midpoint/commit/b1fe374c02cb497d51619076c8c0ff352d6aef5d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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 infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/MergeDeltas.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/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml

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


  Commit: 657043dac03f5433b2d2a4d8269ad4d1c882aae1
      https://github.com/Evolveum/midpoint/commit/657043dac03f5433b2d2a4d8269ad4d1c882aae1
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java

  Log Message:
  -----------
  fix for Merge objects


  Commit: bf422b1a6f7466151ee658a61dc28ebece29a720
      https://github.com/Evolveum/midpoint/commit/bf422b1a6f7466151ee658a61dc28ebece29a720
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  imrpoving logging for self registration page and confirmation page


  Commit: 3209fd658732d256f07e49a9428ed697cc177ed0
      https://github.com/Evolveum/midpoint/commit/3209fd658732d256f07e49a9428ed697cc177ed0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

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

  Log Message:
  -----------
  new search items - effective status and lifecycle state


  Commit: 73b1276eef6ad7db54dc64c8241041020b4b6bfd
      https://github.com/Evolveum/midpoint/commit/73b1276eef6ad7db54dc64c8241041020b4b6bfd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

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

  Log Message:
  -----------
  More deputy tests (MID-3472)


  Commit: ad52e8e8ab709d34046bca160baca061d15be78e
      https://github.com/Evolveum/midpoint/commit/ad52e8e8ab709d34046bca160baca061d15be78e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

  Log Message:
  -----------
  changing captcha generation - using numbers
refreshing captcha after validation failure.


  Commit: 34e1a3d0f73c66135501b6130f239187d859fcad
      https://github.com/Evolveum/midpoint/commit/34e1a3d0f73c66135501b6130f239187d859fcad
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

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

  Log Message:
  -----------
  captcha validation behaviour improvement - don't remove password if captcha validation failed


  Commit: dd7115e9ea247b4d6931ce7448d6f957a40ad494
      https://github.com/Evolveum/midpoint/commit/dd7115e9ea247b4d6931ce7448d6f957a40ad494
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    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/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java

  Log Message:
  -----------
  Fixed editing certification definition (after prism refactoring).


  Commit: f6e9931897d3e7c596f4d10486f2790c42f5f157
      https://github.com/Evolveum/midpoint/commit/f6e9931897d3e7c596f4d10486f2790c42f5f157
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  additional property for additional text on registration page, tooltip for password


  Commit: 6bd19d2838a8e71c79d6c67d2a20ac3c94a3b8e3
      https://github.com/Evolveum/midpoint/commit/6bd19d2838a8e71c79d6c67d2a20ac3c94a3b8e3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.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/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.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/TestDeputy.java
    M model/model-intest/src/test/resources/common/role-cyan-sailor.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-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

  Log Message:
  -----------
  Deputy: assignment limitations (MID-3472)


  Commit: 329964e919f5b12b1a558fb0f031e6f24f0e433d
      https://github.com/Evolveum/midpoint/commit/329964e919f5b12b1a558fb0f031e6f24f0e433d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  More tests for partial delegation and expriration of delegation.


  Commit: d89ac9e3279015e9bebc5250b8e102beb388c2e5
      https://github.com/Evolveum/midpoint/commit/d89ac9e3279015e9bebc5250b8e102beb388c2e5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    A gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.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/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-delegator.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Delegation authorization, default delegator role, basic authorization tests (MID-3472)


  Commit: ca1b179921c6502af8951b6dc8e3e96342daccc1
      https://github.com/Evolveum/midpoint/commit/ca1b179921c6502af8951b6dc8e3e96342daccc1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  schema for reset password


  Commit: 8ffad850688b80e2d0d7943a80b4a6608315275f
      https://github.com/Evolveum/midpoint/commit/8ffad850688b80e2d0d7943a80b4a6608315275f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PolicyConstraintKind.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/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java

  Log Message:
  -----------
  Fist steps towards compliance rules and policyStatus implementation


  Commit: 7e1d6522fd325d80483c7ded9bb7e50568413402
      https://github.com/Evolveum/midpoint/commit/7e1d6522fd325d80483c7ded9bb7e50568413402
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    A 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/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    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 infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  resret password implementation.


  Commit: d8de9e5266c61d8a5a18243e547463601cdb5fa0
      https://github.com/Evolveum/midpoint/commit/d8de9e5266c61d8a5a18243e547463601cdb5fa0
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    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/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  work on Delegations tab


  Commit: e5107378682aede3f258ddbe793bd869e7c41d1f
      https://github.com/Evolveum/midpoint/commit/e5107378682aede3f258ddbe793bd869e7c41d1f
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    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/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.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/security/MidPointGuiAuthorizationEvaluator.java
    A gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.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/AssignmentEvaluator.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/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.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/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    M model/model-intest/src/test/resources/common/role-red-sailor.xml
    M model/model-intest/src/test/resources/common/role-sailor.xml
    A model/model-intest/src/test/resources/security/role-delegator.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/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: d3ac9a5a2792b7c5bd7e49438600083eb811cccb
      https://github.com/Evolveum/midpoint/commit/d3ac9a5a2792b7c5bd7e49438600083eb811cccb
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

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

  Log Message:
  -----------
  resret password channel


  Commit: 58a172bf9996f4bc7d7f21e27c1e24c5cbca512b
      https://github.com/Evolveum/midpoint/commit/58a172bf9996f4bc7d7f21e27c1e24c5cbca512b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

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

  Log Message:
  -----------
  fixing typo


  Commit: 21b630b8d88793e306d95e455430d920eaebc653
      https://github.com/Evolveum/midpoint/commit/21b630b8d88793e306d95e455430d920eaebc653
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    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/EvaluatedAssignmentImpl.java
    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/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
    A model/model-intest/src/test/resources/rbac/role-governor-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-intest/testng-integration.xml

  Log Message:
  -----------
  Basic support for policy rules in assignments


  Commit: 4d1758d1575e7d3b39bd451d2e357d274a3613dd
      https://github.com/Evolveum/midpoint/commit/4d1758d1575e7d3b39bd451d2e357d274a3613dd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  fixing npe, improving erroir handling. added validator for emails..


  Commit: 2f189c536aed9b1a58432ef05889b43e5592bce0
      https://github.com/Evolveum/midpoint/commit/2f189c536aed9b1a58432ef05889b43e5592bce0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java

  Log Message:
  -----------
  authz for reset passwrod


  Commit: b5a492e6460041c873944f0c6f75b7d7b2116435
      https://github.com/Evolveum/midpoint/commit/b5a492e6460041c873944f0c6f75b7d7b2116435
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  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/AssignmentEvaluator.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing limitTargetContent


  Commit: 959d7965b44b20607b96a9538c6d542a0856c16d
      https://github.com/Evolveum/midpoint/commit/959d7965b44b20607b96a9538c6d542a0856c16d
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  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/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  work on Delegations tab


  Commit: 2cdbf198408f493be872fc361c38b2042dca4b18
      https://github.com/Evolveum/midpoint/commit/2cdbf198408f493be872fc361c38b2042dca4b18
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PolicyConstraintKind.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/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
    A model/model-intest/src/test/resources/rbac/role-governor-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 9fc834e17692704aecf5e466f75978ec3ed59436
      https://github.com/Evolveum/midpoint/commit/9fc834e17692704aecf5e466f75978ec3ed59436
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  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/component/assignment/DelegationEditorPanel.java

  Log Message:
  -----------
  work on Delegations tab


  Commit: 201d5db46aa5c198142f40eb631aa51085a00cf8
      https://github.com/Evolveum/midpoint/commit/201d5db46aa5c198142f40eb631aa51085a00cf8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    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/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A 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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.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/TestRbacDeprecated.java
    M model/model-intest/src/test/resources/common/role-judge-deprecated.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml

  Log Message:
  -----------
  Adjustements and test for policy rules.


  Commit: 9766463911a588b7fa3fd41a7e652dc9ca2769ca
      https://github.com/Evolveum/midpoint/commit/9766463911a588b7fa3fd41a7e652dc9ca2769ca
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  Changed paths:
    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/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/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PolicyConstraintKind.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/EvaluatedPolicyRuleImpl.java
    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/AssignmentProcessor.java

  Log Message:
  -----------
  Further adjustement of the policy rules interfaces and schema.


  Commit: 6704639f065cd0cea81105a0b7aecce82e04103c
      https://github.com/Evolveum/midpoint/commit/6704639f065cd0cea81105a0b7aecce82e04103c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

  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/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    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/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/rbac/role-immutable.xml

  Log Message:
  -----------
  Object rules and simple tests


  Commit: 506fb04399057602f08d7b4ea8d3732a7b6cf426
      https://github.com/Evolveum/midpoint/commit/506fb04399057602f08d7b4ea8d3732a7b6cf426
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-14 (Mon, 14 Nov 2016)

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

  Log Message:
  -----------
  Cleanint up. That was a bad idea.


  Commit: c3dc4e22387075a479f3318069f35f5ab3d31164
      https://github.com/Evolveum/midpoint/commit/c3dc4e22387075a479f3318069f35f5ab3d31164
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  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/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Delegations tab not working yet


  Commit: 49a6837461451869d17fe3a6afef6a90e97ac9ee
      https://github.com/Evolveum/midpoint/commit/49a6837461451869d17fe3a6afef6a90e97ac9ee
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    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/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PolicyConstraintKind.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
    A 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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    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/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/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/TestRbacDeprecated.java
    M model/model-intest/src/test/resources/common/role-judge-deprecated.xml
    M model/model-intest/src/test/resources/common/role-judge.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-immutable.xml

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


  Commit: be8f41399b691e71aca97442e39b5f7b699b59f2
      https://github.com/Evolveum/midpoint/commit/be8f41399b691e71aca97442e39b5f7b699b59f2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.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/EvaluatedPolicyRuleImpl.java

  Log Message:
  -----------
  PolicyStatus in EvaluatedAssignment


  Commit: c2a9675998d19b954dfebb50e3ec549462348681
      https://github.com/Evolveum/midpoint/commit/c2a9675998d19b954dfebb50e3ec549462348681
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  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/TestDeputy.java
    A model/model-intest/src/test/resources/common/role-drinker.xml

  Log Message:
  -----------
  More deputy tests


  Commit: e3f2521b0e113dfe6ef1a5c2a754d0008eb51b31
      https://github.com/Evolveum/midpoint/commit/e3f2521b0e113dfe6ef1a5c2a754d0008eb51b31
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

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

  Log Message:
  -----------
  Even more deputy tests


  Commit: 06500620b26ec55fab22b8456b51f26f1c0dd5be
      https://github.com/Evolveum/midpoint/commit/06500620b26ec55fab22b8456b51f26f1c0dd5be
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-11-15 (Tue, 15 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/PolyStringDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/XmlGregorianCalendarSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack-old.json
    M infra/prism/src/test/resources/common/json/user-jack-v1.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/json/user-will.json
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/src/test/resources/common/yaml/user-will.yaml
    M infra/prism/testng-unit.xml

  Log Message:
  -----------
  Fixed timestamps serialization in JSON/YAML.


  Commit: 394fe81c34d32765138a57b92f2e326df160c4a2
      https://github.com/Evolveum/midpoint/commit/394fe81c34d32765138a57b92f2e326df160c4a2
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  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/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java

  Log Message:
  -----------
  Delegations tab : saving a delegation


  Commit: f9525e5292842b8f6482e45e1ee74f6de521d93b
      https://github.com/Evolveum/midpoint/commit/f9525e5292842b8f6482e45e1ee74f6de521d93b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/PolyStringDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/XmlGregorianCalendarSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack-old.json
    M infra/prism/src/test/resources/common/json/user-jack-v1.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/json/user-will.json
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/src/test/resources/common/yaml/user-will.yaml
    M infra/prism/testng-unit.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.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/EvaluatedPolicyRuleImpl.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/TestDeputy.java
    A model/model-intest/src/test/resources/common/role-drinker.xml

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


  Commit: b44a6556502fdf2d843d2b6a15b087416706d25b
      https://github.com/Evolveum/midpoint/commit/b44a6556502fdf2d843d2b6a15b087416706d25b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  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/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/rbac/role-immutable.xml
    A model/model-intest/src/test/resources/rbac/role-non-assignable.xml

  Log Message:
  -----------
  processing of assignment policy rules


  Commit: 74da159d2c962d73d1bf75c23138d95a8d3f9680
      https://github.com/Evolveum/midpoint/commit/74da159d2c962d73d1bf75c23138d95a8d3f9680
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  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/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  Delegated to me tab is added


  Commit: 680d2f0740f3f31ce5f9655ef60a3b5a4e17cd10
      https://github.com/Evolveum/midpoint/commit/680d2f0740f3f31ce5f9655ef60a3b5a4e17cd10
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-16 (Wed, 16 Nov 2016)

  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/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/rbac/role-immutable.xml
    A model/model-intest/src/test/resources/rbac/role-non-assignable.xml

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


  Commit: 3c0c2d1278bcd6fdf38a43d55fc6ae3fb773803c
      https://github.com/Evolveum/midpoint/commit/3c0c2d1278bcd6fdf38a43d55fc6ae3fb773803c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

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

  Log Message:
  -----------
  MID-3496 locality searchable through UI


  Commit: 8f7d1b335dcbaa086bbf161d5061028f27b84b02
      https://github.com/Evolveum/midpoint/commit/8f7d1b335dcbaa086bbf161d5061028f27b84b02
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.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/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    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/StageEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.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/users/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    A gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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 infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/PolyStringDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/XmlGregorianCalendarSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack-old.json
    M infra/prism/src/test/resources/common/json/user-jack-v1.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/json/user-will.json
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/src/test/resources/common/yaml/user-will.yaml
    M infra/prism/testng-unit.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.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/util/MergeDeltas.java
    A 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/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.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/EvaluatedAssignmentTargetImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
    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/LensFocusContext.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/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/AbstractConfiguredModelIntegrationTest.java
    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/TestConnectorMultiInstance.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
    M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
    A model/model-intest/src/test/resources/common/role-drinker.xml
    M model/model-intest/src/test/resources/common/role-judge-deprecated.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/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-governor.xml
    A model/model-intest/src/test/resources/rbac/role-immutable.xml
    A model/model-intest/src/test/resources/rbac/role-non-assignable.xml
    A model/model-intest/src/test/resources/security/role-delegator.xml
    M model/model-intest/testng-integration.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/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml

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

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


  Commit: 27e3cd7f92f6923d0760da44d903ba9f9ecebf87
      https://github.com/Evolveum/midpoint/commit/27e3cd7f92f6923d0760da44d903ba9f9ecebf87
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

  Log Message:
  -----------
  MID-3516 support for lifecycle and policy situation


  Commit: cd09964215a2c719bade4e8a3a5ed2302e1f45e3
      https://github.com/Evolveum/midpoint/commit/cd09964215a2c719bade4e8a3a5ed2302e1f45e3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql

  Log Message:
  -----------
  MID-3516 updated sql scripts


  Commit: 56a978927667e59eb053324ab4b6a2b23d2acc00
      https://github.com/Evolveum/midpoint/commit/56a978927667e59eb053324ab4b6a2b23d2acc00
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

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

  Log Message:
  -----------
  fix for Name search


  Commit: cc6bf3ef37fb586e0c99d18fb05174211cbf580b
      https://github.com/Evolveum/midpoint/commit/cc6bf3ef37fb586e0c99d18fb05174211cbf580b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

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


  Commit: 4627172610ffdc624bef145528aae52ee8046995
      https://github.com/Evolveum/midpoint/commit/4627172610ffdc624bef145528aae52ee8046995
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

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


  Commit: 5c0cdc7ceef790e0b02daf30f89ad77dcec7a262
      https://github.com/Evolveum/midpoint/commit/5c0cdc7ceef790e0b02daf30f89ad77dcec7a262
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ItemDeltaItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.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/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Storing assignment metadata (MID-2234)


  Commit: 281b518ee98fc745eb5ab6f89658771cfd186e60
      https://github.com/Evolveum/midpoint/commit/281b518ee98fc745eb5ab6f89658771cfd186e60
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M config/sql/midpoint/3.5/h2/h2-3.5.sql
    M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
    M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
    M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
    M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
    M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    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/search/Search.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    A 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/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    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/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
    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/security/AuthenticationEvaluatorImpl.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

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


  Commit: 29be700a8f2bc0e6e3e0e569373f69f9d102fdf6
      https://github.com/Evolveum/midpoint/commit/29be700a8f2bc0e6e3e0e569373f69f9d102fdf6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  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/FocusProcessor.java

  Log Message:
  -----------
  Fixing object policy rule evaluation


  Commit: 2b96860293542f9e11c3a1be32a301644d0eef62
      https://github.com/Evolveum/midpoint/commit/2b96860293542f9e11c3a1be32a301644d0eef62
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  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/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Delegations improvements


  Commit: b45fc4b4df97269cdfe63720292da4ee90d1bc55
      https://github.com/Evolveum/midpoint/commit/b45fc4b4df97269cdfe63720292da4ee90d1bc55
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    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/search/SearchFactory.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    A 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/PageSelfCredentials.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    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/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ItemDeltaItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    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/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.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/security/AuthenticationEvaluatorImpl.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/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 65ee6680d21d96ac0a0f0396d173eac9a0c3b0f1
      https://github.com/Evolveum/midpoint/commit/65ee6680d21d96ac0a0f0396d173eac9a0c3b0f1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  small improvement for reset password - fixing error messages.


  Commit: 23640292a51c5dec77c16820481295108d5ba673
      https://github.com/Evolveum/midpoint/commit/23640292a51c5dec77c16820481295108d5ba673
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  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/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.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/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ItemDeltaItem.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    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/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 3d098a31fba05247b239cf18db839c37d38cca04
      https://github.com/Evolveum/midpoint/commit/3d098a31fba05247b239cf18db839c37d38cca04
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  implemented deletion of delegations


  Commit: ec25a9bee8ab2eb8013a9e0f2552a3cd6f4ab7b8
      https://github.com/Evolveum/midpoint/commit/ec25a9bee8ab2eb8013a9e0f2552a3cd6f4ab7b8
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

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


  Commit: b65cfe1608b0f0eeefbc59927e2499519ca5905c
      https://github.com/Evolveum/midpoint/commit/b65cfe1608b0f0eeefbc59927e2499519ca5905c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-18 (Fri, 18 Nov 2016)

  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/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/MetadataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    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/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/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/security/role-prop-read-all-modify-some.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  More work on assignment metadata. Not entirelly successful. (MID-2234)


  Commit: 28a91480d11099774d290bdd25a36e0ec4f67f9c
      https://github.com/Evolveum/midpoint/commit/28a91480d11099774d290bdd25a36e0ec4f67f9c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-19 (Sat, 19 Nov 2016)

  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/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  Merge branch 'master' into feature/assignment-metadata


  Commit: d198d4fd24220cf3d09577d16f5b8c4fb7794472
      https://github.com/Evolveum/midpoint/commit/d198d4fd24220cf3d09577d16f5b8c4fb7794472
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-19 (Sat, 19 Nov 2016)

  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/ChangeExecutor.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/MetadataManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    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/TestPreviewChanges.java

  Log Message:
  -----------
  Fixing metadata deltas (MID-2234, MID-3530)


  Commit: e9cc551469d57aa6697b7ca5d6c2cadf86bc40cd
      https://github.com/Evolveum/midpoint/commit/e9cc551469d57aa6697b7ca5d6c2cadf86bc40cd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-20 (Sun, 20 Nov 2016)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java

  Log Message:
  -----------
  Fixing schema tests


  Commit: 818142965a456e19b2566d469e5923b584b1814d
      https://github.com/Evolveum/midpoint/commit/818142965a456e19b2566d469e5923b584b1814d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.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-bloody-fool.xml
    A model/model-intest/src/test/resources/rbac/role-meta-fool.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Tests for modification of metarole and recompute.


  Commit: 1ef6fad7b4dfca1d381c68e554224443ae5914f8
      https://github.com/Evolveum/midpoint/commit/1ef6fad7b4dfca1d381c68e554224443ae5914f8
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  implemented for shopping cart details page


  Commit: aa8b533e2f7f1b0e0b8c4bc1c87b8f2370a00905
      https://github.com/Evolveum/midpoint/commit/aa8b533e2f7f1b0e0b8c4bc1c87b8f2370a00905
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  Changed paths:
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.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-bloody-fool.xml
    A model/model-intest/src/test/resources/rbac/role-meta-fool.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 23ecca15d18309b320ba0f22c5c0fe208bd66c8d
      https://github.com/Evolveum/midpoint/commit/23ecca15d18309b320ba0f22c5c0fe208bd66c8d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-21 (Mon, 21 Nov 2016)

  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

  Log Message:
  -----------
  small improvements for search items - gui


  Commit: 72f679360edacb14f12b8aaaae6109cf0a9217f8
      https://github.com/Evolveum/midpoint/commit/72f679360edacb14f12b8aaaae6109cf0a9217f8
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Metadata panel for assignments


  Commit: f70b70c68167b8a42bbdb2b028aa70ea4bdcfad5
      https://github.com/Evolveum/midpoint/commit/f70b70c68167b8a42bbdb2b028aa70ea4bdcfad5
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  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

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


  Commit: 76ab933579f923199673f70b69341d6e9f2ff362
      https://github.com/Evolveum/midpoint/commit/76ab933579f923199673f70b69341d6e9f2ff362
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

  Log Message:
  -----------
  impelmenting MID-3447


  Commit: b18696f09ae4007c882fcfd963b5e47d2e95784d
      https://github.com/Evolveum/midpoint/commit/b18696f09ae4007c882fcfd963b5e47d2e95784d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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


  Commit: c8c896d652504af746bfb455af2eecd3e0b121db
      https://github.com/Evolveum/midpoint/commit/c8c896d652504af746bfb455af2eecd3e0b121db
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-22 (Tue, 22 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Schema documentation updates


  Commit: e9b7c3a036203d2ead543a0940ba77f40decf1f6
      https://github.com/Evolveum/midpoint/commit/e9b7c3a036203d2ead543a0940ba77f40decf1f6
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    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/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java

  Log Message:
  -----------
  Metadata panel for object details page


  Commit: 5806fa4041bc77adb3d95cbd31ec5b7a21ae3a0b
      https://github.com/Evolveum/midpoint/commit/5806fa4041bc77adb3d95cbd31ec5b7a21ae3a0b
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java

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


  Commit: 66059ea293b439bf85347f6e8e08a9a5ba43b987
      https://github.com/Evolveum/midpoint/commit/66059ea293b439bf85347f6e8e08a9a5ba43b987
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuditService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/AuditController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-auditor.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Audit log access authorizations (model) (MID-3495)


  Commit: 0de9415b8f57d432eb551d17885f6a8aa23e8dca
      https://github.com/Evolveum/midpoint/commit/0de9415b8f57d432eb551d17885f6a8aa23e8dca
  Author: honchar <honchar at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  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/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java

  Log Message:
  -----------
  Updated shopping cart details page with targetRef object description


  Commit: f9406d7f0ad3786e1651a989c59fe5b68eee4313
      https://github.com/Evolveum/midpoint/commit/f9406d7f0ad3786e1651a989c59fe5b68eee4313
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  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/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MetadataPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingKartEditorPanel.java

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


  Commit: dd863e7572e47f4ff659eb310a4dbceefb4e55de
      https://github.com/Evolveum/midpoint/commit/dd863e7572e47f4ff659eb310a4dbceefb4e55de
  Author: Petr Gašparík <petr.gasparik at ami.cz>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.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_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.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 infra/schema/src/main/resources/localization/schema_ar.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_es_AR.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hi.properties
    M infra/schema/src/main/resources/localization/schema_hu.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

  Log Message:
  -----------
  Merge branch 'transifex'

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


Compare: https://github.com/Evolveum/midpoint/compare/3768b64fb93b...dd863e7572e4


More information about the midPoint-svn mailing list