[midPoint-git] [Evolveum/midpoint] 384f51: MID-7976 conflict item panel, wip

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 384f512a66c0c0035d7d18218d2a6197762798c6
      https://github.com/Evolveum/midpoint/commit/384f512a66c0c0035d7d18218d2a6197762798c6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java

  Log Message:
  -----------
  MID-7976 conflict item panel, wip


  Commit: 8bb87e0f33149b32e1afd9b3700624d79ba775d4
      https://github.com/Evolveum/midpoint/commit/8bb87e0f33149b32e1afd9b3700624d79ba775d4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgeListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgePanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDelineation.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/DelineationProcessor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/classification/DelineationMatcher.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjObjectTypes.java
    M provisioning/provisioning-impl/src/test/resources/opendj/types/resource-opendj-types.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/24511eb7fc16...8bb87e0f3314