[midPoint-git] [Evolveum/midpoint] 53f527: resolving conflicts after cherry picking optimizat...

[Katarina Valalikova]

  Branch: refs/heads/support-4.1
  Home:   https://github.com/Evolveum/midpoint
  Commit: 53f5278f3a13d02cbd36c42e5f7ba4a2a88831ea
      https://github.com/Evolveum/midpoint/commit/53f5278f3a13d02cbd36c42e5f7ba4a2a88831ea
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PendingOperationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ProjectionDisplayNamePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismContainerWrapperFactoryImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemHeaderPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ResourceAttributeDefinitionHeaderPanel.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/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

  Log Message:
  -----------
  resolving conflicts after cherry picking optimizations for MID-6593


  Commit: cb1001d9fc7a8558eac0eda8cc08372dea4227ae
      https://github.com/Evolveum/midpoint/commit/cb1001d9fc7a8558eac0eda8cc08372dea4227ae
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-12-15 (Tue, 15 Dec 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java

  Log Message:
  -----------
  fix for shadow panel - attributes are now displayed


Compare: https://github.com/Evolveum/midpoint/compare/9e23cc7f8d6d...cb1001d9fc7a