[midPoint-git] [Evolveum/midpoint] 75d824: some fixes for history pages

Katarina Valalikova k.valalikova at evolveum.com
Mon Aug 6 14:11:02 CEST 2018


  Branch: refs/heads/feature/service-accounts
  Home:   https://github.com/Evolveum/midpoint
  Commit: 75d8240387d8b38a1d54f9765bf4eba83a8abe71
      https://github.com/Evolveum/midpoint/commit/75d8240387d8b38a1d54f9765bf4eba83a8abe71
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-18 (Wed, 18 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

  Log Message:
  -----------
  some fixes for history pages


  Commit: 8490648257e3a876905293e8514f8351487dc5a1
      https://github.com/Evolveum/midpoint/commit/8490648257e3a876905293e8514f8351487dc5a1
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-20 (Fri, 20 Jul 2018)

  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/objectdetails/AbstractRoleMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  tab panels for shopping cart, not finished


  Commit: f300781cfaaf2f82089f7a99b4ed266724c4b60a
      https://github.com/Evolveum/midpoint/commit/f300781cfaaf2f82089f7a99b4ed266724c4b60a
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-07-20 (Fri, 20 Jul 2018)

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

  Log Message:
  -----------
  Translation update

Thanks to all transifex contributors: atuc2 (fi), kremerpatricklux (fr), merlincaf (it), petr.gasparik (cs), rpudil (cs), StéphaneA (fr), wstaszewsk (pl)


  Commit: 5b21c7f6aa34a30035052f3b974c7d99994beb54
      https://github.com/Evolveum/midpoint/commit/5b21c7f6aa34a30035052f3b974c7d99994beb54
  Author: Petr Gašparík <petr at gasparik.cz>
  Date:   2018-07-20 (Fri, 20 Jul 2018)

  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_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.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_fi.properties
    M infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/main/resources/localization/schema_it.properties

  Log Message:
  -----------
  Translation update

Thanks to all transifex contributors: atuc2 (fi), kremerpatricklux (fr),
merlincaf (it), petr.gasparik (cs), rpudil (cs), Stephane (fr),
wstaszewsk (pl)


  Commit: 75d44e66fe1f44e101c8f42540b21ff06a3540a6
      https://github.com/Evolveum/midpoint/commit/75d44e66fe1f44e101c8f42540b21ff06a3540a6
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-21 (Sat, 21 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java

  Log Message:
  -----------
  fixing the functionality after shopping cart restructurizing


  Commit: 0ff3e055f50c47e9924c99e235e2565f03cb8839
      https://github.com/Evolveum/midpoint/commit/0ff3e055f50c47e9924c99e235e2565f03cb8839
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-21 (Sat, 21 Jul 2018)

  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_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.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_fi.properties
    M infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/main/resources/localization/schema_it.properties

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


  Commit: b7d10f2f1c736cd59c8b252c4a9b009d5f5ab224
      https://github.com/Evolveum/midpoint/commit/b7d10f2f1c736cd59c8b252c4a9b009d5f5ab224
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java

  Log Message:
  -----------
  users view tab panel


  Commit: 4ed7fd116121a457a3fcfff65746ce842f9297ae
      https://github.com/Evolveum/midpoint/commit/4ed7fd116121a457a3fcfff65746ce842f9297ae
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.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/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties

  Log Message:
  -----------
  shopping cart feature


  Commit: 7abfb1c66699f548044284c0a331bf2dfa218853
      https://github.com/Evolveum/midpoint/commit/7abfb1c66699f548044284c0a331bf2dfa218853
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    A CONTRIBUTING.md

  Log Message:
  -----------
  Create CONTRIBUTING.md


  Commit: da3239e93d3dc13207f46ffb9eae999ecdef0335
      https://github.com/Evolveum/midpoint/commit/da3239e93d3dc13207f46ffb9eae999ecdef0335
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java

  Log Message:
  -----------
  relations drop down component


  Commit: 9703a97cabcfc0420ca5f63dafca3acb12d7a454
      https://github.com/Evolveum/midpoint/commit/9703a97cabcfc0420ca5f63dafca3acb12d7a454
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    A CONTRIBUTING.md

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


  Commit: aa807174b315558215a2ff2bcf5a34257c2112f9
      https://github.com/Evolveum/midpoint/commit/aa807174b315558215a2ff2bcf5a34257c2112f9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fix "clean up closed task" functionality

Adapting PageTasks and cleanup handler to recent changes of
CleanupPoliciesType from a property to a container.


  Commit: 70a9b90b844b589b7607097c07652cb322726f1f
      https://github.com/Evolveum/midpoint/commit/70a9b90b844b589b7607097c07652cb322726f1f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-24 (Tue, 24 Jul 2018)

  Changed paths:
    A CONTRIBUTING.md
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeMemberTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeMemberTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeAssignmentPopupTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeAssignmentPopupTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTypeAssignmentPopupTabPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.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/FocusTabVisibleBehavior.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/AbstractAssignmentListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.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/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeDialogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/HelpInfoPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/Popupable.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.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/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/ObjectHistoryTabPanel.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/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/RichHyperlinkConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreeAssignablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ParameterPropertiesPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleHistory.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleHistory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceMemberPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceRelationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleRelationSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnitHistory.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnitHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUserHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.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/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.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_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/VirtualAssignmenetSpecification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LifecycleUtil.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LifecyleUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/main/resources/localization/schema_it.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/SystemObjectCache.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/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusLifecycleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.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/security/TestAbstractAuthenticationEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLifecycle.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/gensync/system-configuration.xml
    A model/model-intest/src/test/resources/lifecycle/role-croupier.xml
    M model/model-intest/src/test/resources/lifecycle/system-configuration-lifecycle.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
    M repo/security-impl/src/test/java/com/evolveum/midpoint/security/impl/UserProfileServiceMock.java

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


  Commit: 5119f208574771ca5d50d4d02f9c5d3e118e6b96
      https://github.com/Evolveum/midpoint/commit/5119f208574771ca5d50d4d02f9c5d3e118e6b96
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java

  Log Message:
  -----------
  Adapt failed model-intest tests


  Commit: 927f894f3f5868410f0839807639a409907ed965
      https://github.com/Evolveum/midpoint/commit/927f894f3f5868410f0839807639a409907ed965
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/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/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.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_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.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

  Log Message:
  -----------
  relations functionality refactoring for shopping cart panel


  Commit: 6c8e843cc17d6867034e66a098f7243f1bff8b71
      https://github.com/Evolveum/midpoint/commit/6c8e843cc17d6867034e66a098f7243f1bff8b71
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

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


  Commit: 7ab9c287b136d027525fb78c2476ce88f5ed600d
      https://github.com/Evolveum/midpoint/commit/7ab9c287b136d027525fb78c2476ce88f5ed600d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java

  Log Message:
  -----------
  Tests for invalid passwords (MID-4791)


  Commit: 3254d8348d10ea4e489a807c3b45afd21fed94e4
      https://github.com/Evolveum/midpoint/commit/3254d8348d10ea4e489a807c3b45afd21fed94e4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-25 (Wed, 25 Jul 2018)

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

  Log Message:
  -----------
  More password tests needed


  Commit: 409ffd0f1d56c2e8a9c51249b86aac4e1f0d985b
      https://github.com/Evolveum/midpoint/commit/409ffd0f1d56c2e8a9c51249b86aac4e1f0d985b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java

  Log Message:
  -----------
  Move approval request limit to a better place

See MID-4697.


  Commit: 99816d521dae97fe08a88d5a15dbeb3de6417663
      https://github.com/Evolveum/midpoint/commit/99816d521dae97fe08a88d5a15dbeb3de6417663
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/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/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.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_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.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 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java

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


  Commit: d6df32c474e51f164cc889671dfbb7b0374b8493
      https://github.com/Evolveum/midpoint/commit/d6df32c474e51f164cc889671dfbb7b0374b8493
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java

  Log Message:
  -----------
  new relations dropdown component for assignments popup


  Commit: 9b9b1aaec13e1a5bbd9a3e6ed7925cc67cc4c4a1
      https://github.com/Evolveum/midpoint/commit/9b9b1aaec13e1a5bbd9a3e6ed7925cc67cc4c4a1
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java

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


  Commit: f43c70432df13143ba219f67c9d528321397a501
      https://github.com/Evolveum/midpoint/commit/f43c70432df13143ba219f67c9d528321397a501
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  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/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing handling of global vs resource security policy (MID-4793)


  Commit: e39721dcc52e859cc88cac19017806d1a8d9ecd9
      https://github.com/Evolveum/midpoint/commit/e39721dcc52e859cc88cac19017806d1a8d9ecd9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java

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


  Commit: 2920af55cc067d6d84c71eaff5214283ea2f7fa5
      https://github.com/Evolveum/midpoint/commit/2920af55cc067d6d84c71eaff5214283ea2f7fa5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    A model/model-intest/src/test/resources/entitlements/group-swashbucklers-blue.xml
    M model/model-intest/src/test/resources/entitlements/group-swashbucklers.xml
    A model/model-intest/src/test/resources/entitlements/role-swashbuckler-blue.xml

  Log Message:
  -----------
  Tests for strong entitlements and reconciliation (MID-4792)


  Commit: 8c5d003d19b2a814e12a389c5854622d03902960
      https://github.com/Evolveum/midpoint/commit/8c5d003d19b2a814e12a389c5854622d03902960
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.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/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4697 assignments request limit gui part


  Commit: 78c00cd44d249f67f3f7e2f8f5e837e813d8167c
      https://github.com/Evolveum/midpoint/commit/78c00cd44d249f67f3f7e2f8f5e837e813d8167c
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

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

  Log Message:
  -----------
  fix for assignments limit

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


  Commit: 03a4ef912be91231a962a5c5a1a84e2867416f78
      https://github.com/Evolveum/midpoint/commit/03a4ef912be91231a962a5c5a1a84e2867416f78
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java

  Log Message:
  -----------
  relation component for member panels


  Commit: a8f015090728c02359b0f2dac825d06ec3ce6946
      https://github.com/Evolveum/midpoint/commit/a8f015090728c02359b0f2dac825d06ec3ce6946
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Upgrade SpringBoot to 2.0.3 (MID-4353)

This is the first version that contains a fix for our JAR class loading
issue (https://github.com/spring-projects/spring-boot/issues/11367).

Also upgraded spring to 5.0.7, listed as a dependency change
for SB 2.0.3.


  Commit: fd9e7a22c69e92d45c53fd6e4d705029bf4881dc
      https://github.com/Evolveum/midpoint/commit/fd9e7a22c69e92d45c53fd6e4d705029bf4881dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.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/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    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/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    A model/model-intest/src/test/resources/entitlements/group-swashbucklers-blue.xml
    M model/model-intest/src/test/resources/entitlements/group-swashbucklers.xml
    A model/model-intest/src/test/resources/entitlements/role-swashbuckler-blue.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 2597c764b4fde79dbf4cd3fd2f427425384754af
      https://github.com/Evolveum/midpoint/commit/2597c764b4fde79dbf4cd3fd2f427425384754af
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Fix startup after Spring Boot upgrade

Upgraded SnakeYAML version to the one used by Spring Boot (i.e. 1.19).


  Commit: a1cab59fdcd49e8e7304a227175db7d3d38f251a
      https://github.com/Evolveum/midpoint/commit/a1cab59fdcd49e8e7304a227175db7d3d38f251a
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

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

  Log Message:
  -----------
  relation component for org panel


  Commit: c716cab0e3fb785cdcd752dfc45eb49b116699fa
      https://github.com/Evolveum/midpoint/commit/c716cab0e3fb785cdcd752dfc45eb49b116699fa
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M build-system/pom.xml

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


  Commit: 658e09cbd0ba906f6eb9f12e27f4ac64829c3df9
      https://github.com/Evolveum/midpoint/commit/658e09cbd0ba906f6eb9f12e27f4ac64829c3df9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

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

  Log Message:
  -----------
  Fix resetting password using security questions

This is a preliminary work. It should be tested more thoroughly.


  Commit: f65a58d97572131b4c5c27176a4e74eeb3107d13
      https://github.com/Evolveum/midpoint/commit/f65a58d97572131b4c5c27176a4e74eeb3107d13
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java

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


  Commit: 67adcf975f4395b740b1873ca5a686b5dcd72095
      https://github.com/Evolveum/midpoint/commit/67adcf975f4395b740b1873ca5a686b5dcd72095
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

  Log Message:
  -----------
  RelationTypes usage cleanup


  Commit: 6c082de297e6a75a7572102b64ab2d34f3a6d16c
      https://github.com/Evolveum/midpoint/commit/6c082de297e6a75a7572102b64ab2d34f3a6d16c
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

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

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


  Commit: 9208435f7c6778d56a933b51a6f841162ad862db
      https://github.com/Evolveum/midpoint/commit/9208435f7c6778d56a933b51a6f841162ad862db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEnforcer.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver-enforced.xml

  Log Message:
  -----------
  Fix "enforcement too late" issue (MID-4797)

Converted the enforcer hook into a built-in piece of code that
is invoked as part of FocusProcessor execution.


  Commit: d9d98807ffc9ad651c51b483f0ffdec1a2933c5a
      https://github.com/Evolveum/midpoint/commit/d9d98807ffc9ad651c51b483f0ffdec1a2933c5a
  Author: kate <honchar at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  recovering Others tab for adding members popup


  Commit: a6a70b38c8f2d308599c7e3906ec3668c18d6379
      https://github.com/Evolveum/midpoint/commit/a6a70b38c8f2d308599c7e3906ec3668c18d6379
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEnforcer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java

  Log Message:
  -----------
  Block request to add more pruned roles (MID-4766)

When a pruning is detected for an new assignment and the conflicting
assignment is also a new one, a PolicyViolationException is thrown.

This is implemented using a newly introduced mechanism of "enforcement
override" triggers.


  Commit: 08998f994acc6e1170963eca0b9f48aca85fda13
      https://github.com/Evolveum/midpoint/commit/08998f994acc6e1170963eca0b9f48aca85fda13
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    M infra/schema/src/main/resources/localization/schema.properties
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java

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


  Commit: 8711f4e9c0dc51ecdd49fdeed54e52addb7ebfc7
      https://github.com/Evolveum/midpoint/commit/8711f4e9c0dc51ecdd49fdeed54e52addb7ebfc7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java

  Log Message:
  -----------
  Disable failing test in model-test

The test fails because now the rule enforcement is more agile:
occurs as part of the projector, not among hooks.


  Commit: 9ea88e46a185bc8c7f966c3d11c2ab9cd5a3b7e1
      https://github.com/Evolveum/midpoint/commit/9ea88e46a185bc8c7f966c3d11c2ab9cd5a3b7e1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-07-31 (Tue, 31 Jul 2018)

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

  Log Message:
  -----------
  Restrict enforcer to INITIAL clockwork state

This was the behavior of old policy enforcer hook. We keep it
avoid unexpected change in functionality.


  Commit: 8a62206ceea2c44fed8d50848d89f549becf6f81
      https://github.com/Evolveum/midpoint/commit/8a62206ceea2c44fed8d50848d89f549becf6f81
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

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

  Log Message:
  -----------
  Remove duplicate keys in schema.properties


  Commit: 4f3913d3a81ef61c758134e8b4cbde1f49f06b04
      https://github.com/Evolveum/midpoint/commit/4f3913d3a81ef61c758134e8b4cbde1f49f06b04
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  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/users/PageUsersView.java

  Log Message:
  -----------
  fixing object collection views..


  Commit: c6d016dabd7d2022c76059b09a919ca335b11983
      https://github.com/Evolveum/midpoint/commit/c6d016dabd7d2022c76059b09a919ca335b11983
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/schema/src/main/resources/localization/schema.properties
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEnforcer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver-enforced.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java

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


  Commit: 4f107b349375340b0680fedbb3edd2e1f9c977d0
      https://github.com/Evolveum/midpoint/commit/4f107b349375340b0680fedbb3edd2e1f9c977d0
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

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

  Log Message:
  -----------
  another fix for obejct collection views..


  Commit: a11a74dac729c4c5dfdca893d92290aae7b38561
      https://github.com/Evolveum/midpoint/commit/a11a74dac729c4c5dfdca893d92290aae7b38561
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Fix misreading of schema.properties (MID-4800)

When fetching schema.properties resource bundle without the context
of our specially-configured spring ResourceBundleMessageSource it is
read as ISO 8859-1 instead of UTF-8.

This commit replaces almost all such places with the use
of LocalizationService. What remains is ResourceValidatorImpl;
however, it is not used much and - most importantly - when it is
invoked, the schema.properties are already loaded.


  Commit: 836dd410a0e1584b77b6e1be30f5b60698c9ae38
      https://github.com/Evolveum/midpoint/commit/836dd410a0e1584b77b6e1be30f5b60698c9ae38
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  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/users/PageUsersView.java

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


  Commit: 1a7e8de8de77cc8b6493c077aa6d9ef9a86c746c
      https://github.com/Evolveum/midpoint/commit/1a7e8de8de77cc8b6493c077aa6d9ef9a86c746c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M infra/schema/src/main/resources/localization/schema.properties
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java

  Log Message:
  -----------
  Implement localized approval task names (MID-4441)

This was partly done already; this commit adds localized task names
for approval sub-processes. When using "immediate execution" mode these
ones are present in the object metadata.


  Commit: 1630009186301b5ca211ffbf7f749d97feabd09a
      https://github.com/Evolveum/midpoint/commit/1630009186301b5ca211ffbf7f749d97feabd09a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

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

  Log Message:
  -----------
  Definitely fix MID-4800

Removed the last place of explicit fetching of schema.properties
(ResourceValidatorImpl).


  Commit: 932558fed0417405c1376683eba9cccfe293ecf6
      https://github.com/Evolveum/midpoint/commit/932558fed0417405c1376683eba9cccfe293ecf6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

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

  Log Message:
  -----------
  Implement "trigger retry" mechanism (MID-4610)

If the trigger handler fails to execute (by throwing an exception)
the trigger is left intact. Also, when selecting triggers to execute
we now collect all triggers, not only those with timestamp after
the last scanner execution.

This result in repeated processing of failed triggers.


  Commit: ca7705d896b8e126a17d442875d6f1bc810bfb74
      https://github.com/Evolveum/midpoint/commit/ca7705d896b8e126a17d442875d6f1bc810bfb74
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-01 (Wed, 01 Aug 2018)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTriggerHandler.java

  Log Message:
  -----------
  Add a test for trigger retry mechanism (MID-4610)

...and fixed a bug found by the test ;)


  Commit: 6a0fb5b73a05e420bcd85cbd8ec5dbdea4b1de70
      https://github.com/Evolveum/midpoint/commit/6a0fb5b73a05e420bcd85cbd8ec5dbdea4b1de70
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCampaignReiterationTriggerHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/CompletedTaskCleanupTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java

  Log Message:
  -----------
  Designate "resilient" trigger handlers (MID-4610)

Make sure that selected trigger handlers (mainly those related to
certification) retry after they encounter an exception by rethrowing
it.

Other handlers will work as before, i.e. they only log an exception
and do not propagate it; so they will NOT be retried.


  Commit: ac7a83df577c769bfe46f328bb1d34cc1e061b4a
      https://github.com/Evolveum/midpoint/commit/ac7a83df577c769bfe46f328bb1d34cc1e061b4a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

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

  Log Message:
  -----------
  Fix NPE when assigning a resource


  Commit: 7106cc70635159d664522bbf7907448ca1cd44b3
      https://github.com/Evolveum/midpoint/commit/7106cc70635159d664522bbf7907448ca1cd44b3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java

  Log Message:
  -----------
  Fix NPE when listing shadows


  Commit: 52d27b6f8b98958028f4c6def16c25ea25acc503
      https://github.com/Evolveum/midpoint/commit/52d27b6f8b98958028f4c6def16c25ea25acc503
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

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

  Log Message:
  -----------
  Add include and exclude options to /{type} URL

...also with fixing a couple of IDE warnings.


  Commit: 160549d460e2e522f7b6a50236a4f66e00a0965a
      https://github.com/Evolveum/midpoint/commit/160549d460e2e522f7b6a50236a4f66e00a0965a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-08-02 (Thu, 02 Aug 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Prepare schema for task authorizations (MID-3121)

This is preliminary proposal only.


  Commit: 009e9967187a657259ddee973879457ef3575c6a
      https://github.com/Evolveum/midpoint/commit/009e9967187a657259ddee973879457ef3575c6a
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2018-08-06 (Mon, 06 Aug 2018)

  Changed paths:
    A CONTRIBUTING.md
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberForOrgPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.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/AbstractRoleAssignmentPanel.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/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/UserSelectionButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/RelationDropDownChoicePanel.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/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleGovernanceMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServiceHistory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsersView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    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/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/UserViewTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/ShoppingCartConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.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_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_it.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/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/localization/schema_fr.properties
    M infra/schema/src/main/resources/localization/schema_it.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCampaignReiterationTriggerHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageTriggerHandler.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.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/cleanup/CleanUpTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEnforcer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.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/trigger/CompletedTaskCleanupTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/validator/ResourceValidatorImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestTriggerTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/TestPasswordDefaultHashing.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/MockTriggerHandler.java
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    A model/model-intest/src/test/resources/entitlements/group-swashbucklers-blue.xml
    M model/model-intest/src/test/resources/entitlements/group-swashbucklers.xml
    A model/model-intest/src/test/resources/entitlements/role-swashbuckler-blue.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-bronze-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-gold-enforced.xml
    A model/model-intest/src/test/resources/rbac/sod/role-prize-silver-enforced.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskCreationInstruction.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/service-accounts


Compare: https://github.com/Evolveum/midpoint/compare/07261907c6d8...009e9967187a
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the midPoint-svn mailing list