[midPoint-git] [Evolveum/midpoint] ccbeab: password metadata

[Petr Gašparík]

  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: ccbeab4e61819c07830023a5ea100c1ba658ad44
      https://github.com/Evolveum/midpoint/commit/ccbeab4e61819c07830023a5ea100c1ba658ad44
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/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/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.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
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  password metadata


  Commit: fb30ee009729f70c2275a4b1310f581ea49d5d5d
      https://github.com/Evolveum/midpoint/commit/fb30ee009729f70c2275a4b1310f581ea49d5d5d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/GeneratePasswordExecutor.java
    A samples/tasks/bulk-actions/generate-passwords.xml

  Log Message:
  -----------
  Removed obsolete generate-password action executor. Added sample for password generation task.


  Commit: b2855cb007f1d7aabe9859a0b11d9284ea72038e
      https://github.com/Evolveum/midpoint/commit/b2855cb007f1d7aabe9859a0b11d9284ea72038e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties

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


  Commit: c130f353acb27e5b2d2bb038a40e8c90e56e726c
      https://github.com/Evolveum/midpoint/commit/c130f353acb27e5b2d2bb038a40e8c90e56e726c
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java

  Log Message:
  -----------
  minor enhancement - do not show additional attributes panel for WF item when form is not defined


  Commit: 6abc19b6589f7611ee6d7c08de952e92d6e05599
      https://github.com/Evolveum/midpoint/commit/6abc19b6589f7611ee6d7c08de952e92d6e05599
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  adding missing localization for securityPolicyRef in OrgType


  Commit: 93e47a231fcc0edd160343350cb03aaed19dd347
      https://github.com/Evolveum/midpoint/commit/93e47a231fcc0edd160343350cb03aaed19dd347
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/GeneratePasswordExecutor.java
    A samples/tasks/bulk-actions/generate-passwords.xml

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


  Commit: 40d32c4c1df6275c565a20bb723aa1172750dc1d
      https://github.com/Evolveum/midpoint/commit/40d32c4c1df6275c565a20bb723aa1172750dc1d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/JaxbHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ScriptingJaxbUtil.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Fixing conversion from scripting expression to ExecuteScriptType. Allowing ExecuteScriptType in GUI.


  Commit: 31f17a2d3dad67fa1f85d5ee468be8f7b4fa49a6
      https://github.com/Evolveum/midpoint/commit/31f17a2d3dad67fa1f85d5ee468be8f7b4fa49a6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

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

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


  Commit: 2ddc10705225a8b6da0a803474f86663a1865492
      https://github.com/Evolveum/midpoint/commit/2ddc10705225a8b6da0a803474f86663a1865492
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  Role catalog : description is added


  Commit: 21af8fcff230b158d5f40d3c9aa52416588ddfbe
      https://github.com/Evolveum/midpoint/commit/21af8fcff230b158d5f40d3c9aa52416588ddfbe
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPersonasTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.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/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    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/login/PageRegistrationBase.java
    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/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationObjectWrapperFactory.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedStringType.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    A infra/schema/src/test/resources/queryconvertor/test900TypeWrong.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.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/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/GeneratePasswordExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/GenerateValueExecutor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/JaxbHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ScriptingJaxbUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/scripting/generate-passwords-2.xml
    A model/model-intest/src/test/resources/scripting/generate-passwords-3.xml
    M model/model-intest/src/test/resources/scripting/generate-passwords.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/ConfirmationNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/PasswordResetNotifier.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestMiscellaneous.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    A samples/tasks/bulk-actions/generate-passwords.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/json/policy-generate-bad-path.json
    M testing/rest/src/test/resources/repo/json/policy-generate-execute.json
    M testing/rest/src/test/resources/repo/json/policy-generate-honorific-prefix-execute.json
    M testing/rest/src/test/resources/repo/json/policy-generate-password-execute.json
    M testing/rest/src/test/resources/repo/json/policy-generate.json
    M testing/rest/src/test/resources/repo/json/policy-validate-explicit-conflict.json
    M testing/rest/src/test/resources/repo/json/policy-validate-explicit.json
    M testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi-conflict.json
    M testing/rest/src/test/resources/repo/json/policy-validate-implicit-multi.json
    M testing/rest/src/test/resources/repo/json/policy-validate-implicit-password.json
    M testing/rest/src/test/resources/repo/json/policy-validate-implicit-single.json
    M testing/rest/src/test/resources/repo/xml/policy-generate-bad-path.xml
    M testing/rest/src/test/resources/repo/xml/policy-generate-execute.xml
    M testing/rest/src/test/resources/repo/xml/policy-generate-honorific-prefix-execute.xml
    M testing/rest/src/test/resources/repo/xml/policy-generate-password-execute.xml
    M testing/rest/src/test/resources/repo/xml/policy-generate.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-explicit-conflict.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-explicit.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi-conflict.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-implicit-multi.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-implicit-password.xml
    M testing/rest/src/test/resources/repo/xml/policy-validate-implicit-single.xml
    M testing/rest/src/test/resources/repo/yaml/policy-generate-bad-path.yml
    M testing/rest/src/test/resources/repo/yaml/policy-generate-execute.yml
    M testing/rest/src/test/resources/repo/yaml/policy-generate-honorific-prefix-execute.yml
    M testing/rest/src/test/resources/repo/yaml/policy-generate-password-execute.yml
    M testing/rest/src/test/resources/repo/yaml/policy-generate.yml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-explicit-conflict.yml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-explicit.yml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-multi-conflict.yml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-password.yml
    M testing/rest/src/test/resources/repo/yaml/policy-validate-implicit-single.yml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUuid.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    A testing/story/src/test/resources/strings/roles/role-end-user.xml
    M testing/story/src/test/resources/strings/users/barkeeper.xml
    M testing/story/src/test/resources/strings/users/bob.xml
    M testing/story/src/test/resources/strings/users/cheese.xml
    M testing/story/src/test/resources/strings/users/chef.xml
    M testing/story/src/test/resources/strings/users/elaine.xml

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


  Commit: 0778545027f64818ea6b6e94d6cb87f088c2dd9d
      https://github.com/Evolveum/midpoint/commit/0778545027f64818ea6b6e94d6cb87f088c2dd9d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java

  Log Message:
  -----------
  execute-script and notify (with handler) bulk actions require root access


  Commit: 086fb4318d428f85dda1b25a8ed5ad998a52c5ae
      https://github.com/Evolveum/midpoint/commit/086fb4318d428f85dda1b25a8ed5ad998a52c5ae
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/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/data/MultiButtonTable.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.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
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

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


  Commit: 5f483219c12d6a8bd0acc722baafa7854dcc47d1
      https://github.com/Evolveum/midpoint/commit/5f483219c12d6a8bd0acc722baafa7854dcc47d1
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

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

  Log Message:
  -----------
  objectForms fix


  Commit: cef05d0f256df75c62bd15525cd535c4d641a279
      https://github.com/Evolveum/midpoint/commit/cef05d0f256df75c62bd15525cd535c4d641a279
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/NotifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java

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


  Commit: 6e3505a9207e6d19eee7018de0fc51bfbb4cd1f8
      https://github.com/Evolveum/midpoint/commit/6e3505a9207e6d19eee7018de0fc51bfbb4cd1f8
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java

  Log Message:
  -----------
  code refactoring


  Commit: c6556c0872e96dc776117ba02046d15ca0b75892
      https://github.com/Evolveum/midpoint/commit/c6556c0872e96dc776117ba02046d15ca0b75892
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

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

  Log Message:
  -----------
  fixing build - undeclared dependecy usage


  Commit: e80a7eaabea756adce44009e52339d66b73607fd
      https://github.com/Evolveum/midpoint/commit/e80a7eaabea756adce44009e52339d66b73607fd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

  Log Message:
  -----------
  fixing loading of password policy


  Commit: e14b311dc17cb2a6f2aa5c300450540aa5199523
      https://github.com/Evolveum/midpoint/commit/e14b311dc17cb2a6f2aa5c300450540aa5199523
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

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

  Log Message:
  -----------
  title for target object column in the work items table


  Commit: e8fe8125218cf70e6955c73ec843692a575303be
      https://github.com/Evolveum/midpoint/commit/e8fe8125218cf70e6955c73ec843692a575303be
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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


  Commit: 191e56500e2e8a9e816631f320bb933e713060ac
      https://github.com/Evolveum/midpoint/commit/191e56500e2e8a9e816631f320bb933e713060ac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java

  Log Message:
  -----------
  Fixing bunch of NPEs for bad shadows


  Commit: 6d1a8ec6ba05be312ff0eddc00bc0b0117946a69
      https://github.com/Evolveum/midpoint/commit/6d1a8ec6ba05be312ff0eddc00bc0b0117946a69
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-25 (Thu, 25 May 2017)

  Changed paths:
    M samples/evolveum/hr.csv
    M samples/evolveum/resource-hr.xml

  Log Message:
  -----------
  Switch Evolveum sample to new CSV connector


  Commit: d0644597f3b0e8793fce661e05b653f01a6f5aed
      https://github.com/Evolveum/midpoint/commit/d0644597f3b0e8793fce661e05b653f01a6f5aed
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

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

  Log Message:
  -----------
  fixing NPE while loading webapp


  Commit: 3766e28a38d91d5546211c0265397ba1ccdc631e
      https://github.com/Evolveum/midpoint/commit/3766e28a38d91d5546211c0265397ba1ccdc631e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M samples/evolveum/hr.csv
    M samples/evolveum/resource-hr.xml

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


  Commit: e9f7f33d70501eb436a3c84b908343d25b27b4c3
      https://github.com/Evolveum/midpoint/commit/e9f7f33d70501eb436a3c84b908343d25b27b4c3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  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/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  MID-3938, step 1: optimizing logging-in


  Commit: 1e0cd2190a2b5930f45a74c1cf9eaeb31ce2db65
      https://github.com/Evolveum/midpoint/commit/1e0cd2190a2b5930f45a74c1cf9eaeb31ce2db65
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M samples/evolveum/hr.csv
    M samples/evolveum/resource-hr.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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


  Commit: 35d25e1da5f421dd9d4f80c0edc8ae2d99a77ffe
      https://github.com/Evolveum/midpoint/commit/35d25e1da5f421dd9d4f80c0edc8ae2d99a77ffe
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  title for target object column in the work items table
Add to cart button is added to abstract role details page


  Commit: f8dbeaa68d19211648870b33bc64091815822166
      https://github.com/Evolveum/midpoint/commit/f8dbeaa68d19211648870b33bc64091815822166
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M samples/evolveum/hr.csv
    M samples/evolveum/resource-hr.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java


  Commit: 3f53f892aba05f9c075fa46975af49ecef9d5c69
      https://github.com/Evolveum/midpoint/commit/3f53f892aba05f9c075fa46975af49ecef9d5c69
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/CountableLoadableModel.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/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.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/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  MID-3938, step 2: when editing a user, we delay fetching of all user's assignment targets until really necessary


  Commit: 4c48aed3d37e087823035487a135ca0cec709a01
      https://github.com/Evolveum/midpoint/commit/4c48aed3d37e087823035487a135ca0cec709a01
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

  Log Message:
  -----------
  adding partials results to the policy item defintiiosn (generate,validate values via REST API). minor cleanup


  Commit: 8b7556206f361a8ed0996c209a10f41bee0385ff
      https://github.com/Evolveum/midpoint/commit/8b7556206f361a8ed0996c209a10f41bee0385ff
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

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

  Log Message:
  -----------
  rest api status code improvements (handled + partial errors)


  Commit: d967d0044fe852726d36a90ac6e1ab0eecaa6e63
      https://github.com/Evolveum/midpoint/commit/d967d0044fe852726d36a90ac6e1ab0eecaa6e63
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    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/security/UserProfileServiceImpl.java

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


  Commit: 510c78b4581e4586c6d406c2b2c2349cbe9e29c3
      https://github.com/Evolveum/midpoint/commit/510c78b4581e4586c6d406c2b2c2349cbe9e29c3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java


  Commit: 9f00f329fbaf221f8849f57f04aad0aec9a92dee
      https://github.com/Evolveum/midpoint/commit/9f00f329fbaf221f8849f57f04aad0aec9a92dee
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

  Log Message:
  -----------
  adding test for search - search all users


  Commit: a383b41b742c52cffc203a605d7906a935118551
      https://github.com/Evolveum/midpoint/commit/a383b41b742c52cffc203a605d7906a935118551
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  added logging feature to model rest service


  Commit: 379717ee3acf56f11446de6a4cd751a9719c2295
      https://github.com/Evolveum/midpoint/commit/379717ee3acf56f11446de6a4cd751a9719c2295
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  added logging feature to model ws service


  Commit: e7f5a4d572b4c2e775dce0b5025eb0ff535d7603
      https://github.com/Evolveum/midpoint/commit/e7f5a4d572b4c2e775dce0b5025eb0ff535d7603
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    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/web/page/admin/certification/PageCertDecisions.java

  Log Message:
  -----------
  certification work items count label


  Commit: d41723ecc5c2b828024857e804dbfe035cb67646
      https://github.com/Evolveum/midpoint/commit/d41723ecc5c2b828024857e804dbfe035cb67646
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

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

  Log Message:
  -----------
  fixing search according to item changed - audit log viewer..


  Commit: 6d47d225fb83b2a61ffbe83d802e305dc36a127f
      https://github.com/Evolveum/midpoint/commit/6d47d225fb83b2a61ffbe83d802e305dc36a127f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.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/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    A model/model-intest/src/test/resources/rbac/role-screaming.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/PolicyRuleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimplePolicyRuleNotifier.java

  Log Message:
  -----------
  "notification" policy rule action (incl. trivial policy rule notifier)
"timeValidity" policy constraint


  Commit: de380f1224e728f487991296a088964c44537d8b
      https://github.com/Evolveum/midpoint/commit/de380f1224e728f487991296a088964c44537d8b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M model/model-impl/src/main/resources/ctx-model.xml

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


  Commit: d5237ce8d410a37a837ca8396f19935d86cdbd6d
      https://github.com/Evolveum/midpoint/commit/d5237ce8d410a37a837ca8396f19935d86cdbd6d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

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

  Log Message:
  -----------
  Forgotten check.


  Commit: 18c2764248fb9e271a39d9419eba8c346fe38c12
      https://github.com/Evolveum/midpoint/commit/18c2764248fb9e271a39d9419eba8c346fe38c12
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
    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/CatalogItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java

  Log Message:
  -----------
  added target user selection button to assignments list page (shopping cart)


  Commit: e014c083b459ef85b007a44a0056775d4ffb4996
      https://github.com/Evolveum/midpoint/commit/e014c083b459ef85b007a44a0056775d4ffb4996
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/CountableLoadableModel.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/component/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.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/PageMergeObjects.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-impl/src/main/resources/ctx-model.xml
    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/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    A model/model-intest/src/test/resources/rbac/role-screaming.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/PolicyRuleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimplePolicyRuleNotifier.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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


  Commit: 03457e892b2cb06c5ad7c76dbd0d8dc4d30a6a7d
      https://github.com/Evolveum/midpoint/commit/03457e892b2cb06c5ad7c76dbd0d8dc4d30a6a7d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java

  Log Message:
  -----------
  item path component imrpovements


  Commit: 0dc3284b5178b8272f93fb68a983212924760531
      https://github.com/Evolveum/midpoint/commit/0dc3284b5178b8272f93fb68a983212924760531
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    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/web/component/assignment/AssignmentCatalogPanel.html
    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/CatalogItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-notifications-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-impl/src/main/resources/ctx-model.xml
    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/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    A model/model-intest/src/test/resources/rbac/role-screaming.xml
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/PolicyRuleEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimplePolicyRuleNotifier.java

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


  Commit: 05bb823ac02fb7da743b7c2c2c3810580f2b9076
      https://github.com/Evolveum/midpoint/commit/05bb823ac02fb7da743b7c2c2c3810580f2b9076
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

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

  Log Message:
  -----------
  Fixing recent NPE in notification change hook.


  Commit: 9ffe5d861e2929ce401b12d1ada74ccf83e5cb7f
      https://github.com/Evolveum/midpoint/commit/9ffe5d861e2929ce401b12d1ada74ccf83e5cb7f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.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/assignment/AssignmentCatalogPanel.html
    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/CatalogItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java

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


  Commit: 1742d698b8eb3b024c6c89f6b238c7bfe292a698
      https://github.com/Evolveum/midpoint/commit/1742d698b8eb3b024c6c89f6b238c7bfe292a698
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  Employing repository cache on initial (login) evaluation of assignments.


  Commit: 725bbc60733d91d7dad430e77b2744128921116b
      https://github.com/Evolveum/midpoint/commit/725bbc60733d91d7dad430e77b2744128921116b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

  Log Message:
  -----------
  Attempt to fix performance of "preview changes" and "show all assignments"


  Commit: 5e7910a1cfca9bcf8d36aa260b59fa52b2ff8a9e
      https://github.com/Evolveum/midpoint/commit/5e7910a1cfca9bcf8d36aa260b59fa52b2ff8a9e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

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

  Log Message:
  -----------
  Fixed too eager optimization in login assignment evaluation code.


  Commit: 76f70393e6fb4a5e0e77cb437413bd7213402644
      https://github.com/Evolveum/midpoint/commit/76f70393e6fb4a5e0e77cb437413bd7213402644
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-29 (Mon, 29 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableBean.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java

  Log Message:
  -----------
  Organizationa structure page: performance improvement (MID-3938)


  Commit: 154f13823643ba90f576c2a9fd6a6e23b6bba6e3
      https://github.com/Evolveum/midpoint/commit/154f13823643ba90f576c2a9fd6a6e23b6bba6e3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

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

  Log Message:
  -----------
  added authorizations check for managers panels on the orgs page


  Commit: 99e02681b68ae244417beeb53b56aa033654bdd9
      https://github.com/Evolveum/midpoint/commit/99e02681b68ae244417beeb53b56aa033654bdd9
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.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/util/SelectableBean.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/SelectableFolderContent.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/security/UserProfileServiceImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java

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


  Commit: 01b5010519cbea5915099cfe38ec7bc216ea8aa3
      https://github.com/Evolveum/midpoint/commit/01b5010519cbea5915099cfe38ec7bc216ea8aa3
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  description is added to My Assignments ppanel on the self dashboard page


  Commit: c25e5448c0fadf7b52d876bd9e6b8a55a30849fa
      https://github.com/Evolveum/midpoint/commit/c25e5448c0fadf7b52d876bd9e6b8a55a30849fa
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java

  Log Message:
  -----------
  Optimization of approver/owner relations in projector (MID-3938)


  Commit: 065bf3fca8ac8cfb89ac71bda4c6b708db88c233
      https://github.com/Evolveum/midpoint/commit/065bf3fca8ac8cfb89ac71bda4c6b708db88c233
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-30 (Tue, 30 May 2017)

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

  Log Message:
  -----------
  Fixing TestVillage (clone count)


  Commit: 199eb7c25e61efc96871b0e057767b46243b7f5d
      https://github.com/Evolveum/midpoint/commit/199eb7c25e61efc96871b0e057767b46243b7f5d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

  Log Message:
  -----------
  adding id for question answer container. support in repo..


  Commit: 035f69345c4970c7a93236d7c80137e1b7d6c660
      https://github.com/Evolveum/midpoint/commit/035f69345c4970c7a93236d7c80137e1b7d6c660
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/user-darthadder.xml

  Log Message:
  -----------
  adding test for modify security qestion-answer


  Commit: 5711d5ab3a620370d113450d0f2ddade0620fc81
      https://github.com/Evolveum/midpoint/commit/5711d5ab3a620370d113450d0f2ddade0620fc81
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

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


  Commit: cf439dac511481957fe358d78953551a89651183
      https://github.com/Evolveum/midpoint/commit/cf439dac511481957fe358d78953551a89651183
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PointInTimeType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/ModelWebServiceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-names.xml
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-roleMembershipRef.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/model.wsdl

  Log Message:
  -----------
  Added flexibility to bulk actions, changes in SelectorQualifiedGetOptionType

added 'hideOperationResults' option for bulk actions
added options for 'search' bulk action
moved SelectorQualifiedGetOptionType from api-types-3 to common-3
addded missing GetOperationOption fields to GetOperationOptionsType
org: prefix declared at the root level


  Commit: 124f8a708821fcc3f39480977dad7c71fff9ac62
      https://github.com/Evolveum/midpoint/commit/124f8a708821fcc3f39480977dad7c71fff9ac62
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/ModelRestService.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/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java

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


  Commit: 817b1c8b95768c796542523dbc34e3c823385754
      https://github.com/Evolveum/midpoint/commit/817b1c8b95768c796542523dbc34e3c823385754
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
    A testing/story/src/test/resources/plenty-of-assignments/role-basic.xml
    A testing/story/src/test/resources/plenty-of-assignments/user-cheese.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  Skeleton of plenty-of-assignments story test


  Commit: 36b790ed378bc1e7a4fc05287dcd9bd58630f731
      https://github.com/Evolveum/midpoint/commit/36b790ed378bc1e7a4fc05287dcd9bd58630f731
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

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

  Log Message:
  -----------
  Fixed broken prism tests.


  Commit: 5991ea15d41d5d1d32254b4631494af40c8b2a83
      https://github.com/Evolveum/midpoint/commit/5991ea15d41d5d1d32254b4631494af40c8b2a83
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

  Log Message:
  -----------
  Compulation fixes


  Commit: a9aa0aa8a18ce74c99dcd416f4c7f2cde0b3555d
      https://github.com/Evolveum/midpoint/commit/a9aa0aa8a18ce74c99dcd416f4c7f2cde0b3555d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/LoggingFeature.java
    M model/model-impl/src/main/resources/ctx-model.xml

  Log Message:
  -----------
  moving web service messages to DEBUG level


  Commit: 381d1a9be07073cd88ceb1ace02d7e4c6cdf0a8c
      https://github.com/Evolveum/midpoint/commit/381d1a9be07073cd88ceb1ace02d7e4c6cdf0a8c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

  Log Message:
  -----------
  fixed some imports


  Commit: 41171f63ffa759282ffc9d5485f37010f610515c
      https://github.com/Evolveum/midpoint/commit/41171f63ffa759282ffc9d5485f37010f610515c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

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

# Conflicts:
#	model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
#	samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java


  Commit: 52e219f46939536a29b9813a74c6f0dd2ce5843d
      https://github.com/Evolveum/midpoint/commit/52e219f46939536a29b9813a74c6f0dd2ce5843d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalInspector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java

  Log Message:
  -----------
  TestPlentyOfAssignments and more monitoring


  Commit: edbb655b28127fff19285e3772afd14bf588bd7d
      https://github.com/Evolveum/midpoint/commit/edbb655b28127fff19285e3772afd14bf588bd7d
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M testing/rest/src/test/resources/repo/json/user-darthadder.json
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/xml/modification-replace-answer.xml
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml

  Log Message:
  -----------
  adding missing resource- request for midofy security qeustion-answer (json & yaml)


  Commit: 81a107a201f606cee256d30b5a8babe439e75580
      https://github.com/Evolveum/midpoint/commit/81a107a201f606cee256d30b5a8babe439e75580
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismMonitor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PointInTimeType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalInspector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/LoggingFeature.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/ModelWebServiceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-names.xml
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-roleMembershipRef.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/model.wsdl
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
    A testing/story/src/test/resources/plenty-of-assignments/role-basic.xml
    A testing/story/src/test/resources/plenty-of-assignments/user-cheese.xml
    M testing/story/testng-integration.xml

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


  Commit: eb50ae9f4b96d86109c6daad03cd50af15cb554e
      https://github.com/Evolveum/midpoint/commit/eb50ae9f4b96d86109c6daad03cd50af15cb554e
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

  Log Message:
  -----------
  fixed title for MultiButtonTable items (Role Catalog)


  Commit: b778920c0f9f199ea9bc8fb3760fe42436bbd761
      https://github.com/Evolveum/midpoint/commit/b778920c0f9f199ea9bc8fb3760fe42436bbd761
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismMonitor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PointInTimeType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalInspector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/rest/MidpointAbstractProvider.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/LoggingFeature.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/ModelWebServiceTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.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/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-names.xml
    A model/model-intest/src/test/resources/scripting/search-for-users-resolve-roleMembershipRef.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/model.wsdl
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/resources/repo/json/user-darthadder.json
    M testing/rest/src/test/resources/repo/xml/user-darthadder.xml
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/xml/modification-replace-answer.xml
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    A testing/story/src/test/resources/plenty-of-assignments/role-basic.xml
    A testing/story/src/test/resources/plenty-of-assignments/user-cheese.xml
    M testing/story/testng-integration.xml

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


  Commit: 5edc80125c298e992957b85951f52695ca3d113b
      https://github.com/Evolveum/midpoint/commit/5edc80125c298e992957b85951f52695ca3d113b
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

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

  Log Message:
  -----------
  npe fix for resource config page


  Commit: ca14a193647130cb14f8109e1df3a0d890b15a33
      https://github.com/Evolveum/midpoint/commit/ca14a193647130cb14f8109e1df3a0d890b15a33
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

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

  Log Message:
  -----------
  Solving H2 1.4 slowness?


  Commit: 201eac1bf8fb8a24ef227573e3312fd3ff313fa5
      https://github.com/Evolveum/midpoint/commit/201eac1bf8fb8a24ef227573e3312fd3ff313fa5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

  Log Message:
  -----------
  Compilation fixes related to recent change of GetOperationOptions' XML form.


  Commit: 6e13d01ccdbb76ed9412c860f39db183b469f4d4
      https://github.com/Evolveum/midpoint/commit/6e13d01ccdbb76ed9412c860f39db183b469f4d4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.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/data/MultiButtonTable.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismHeaderPanel.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/PrismObject.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalInspector.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/LoggingFeature.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    M testing/rest/src/test/resources/repo/json/user-darthadder.json
    M testing/rest/src/test/resources/repo/yaml/user-darthadder.yml
    A testing/rest/src/test/resources/req/json/modification-replace-answer.json
    A testing/rest/src/test/resources/req/xml/modification-replace-answer.xml
    A testing/rest/src/test/resources/req/yaml/modification-replace-answer.yml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java

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

# Conflicts:
#	cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
#	model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
#	samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
#	samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
#	testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
#	testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java


  Commit: 21cd4202fe4f5d6af3b7ce9b01811a772aa8868c
      https://github.com/Evolveum/midpoint/commit/21cd4202fe4f5d6af3b7ce9b01811a772aa8868c
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

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

  Log Message:
  -----------
  description for role catalog items


  Commit: 45eac4777098d4314e37d7fe7687fb68fc579ebb
      https://github.com/Evolveum/midpoint/commit/45eac4777098d4314e37d7fe7687fb68fc579ebb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

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

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


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

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

  Log Message:
  -----------
  little improvement of My assignments items description


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

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

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


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

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

  Log Message:
  -----------
  set default filter for org tree to Subtree User(type)


  Commit: 5a122fad980002fa36822814a54937bb84cb1cb9
      https://github.com/Evolveum/midpoint/commit/5a122fad980002fa36822814a54937bb84cb1cb9
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties

  Log Message:
  -----------
  Small translation update


Compare: https://github.com/Evolveum/midpoint/compare/1a2957c48553...5a122fad9800