[midPoint-git] [Evolveum/midpoint] b2f514: Assignments conflicts panel, first working version

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: b2f514a8164535c53e7d2aa5d2101cd484aa8c53
      https://github.com/Evolveum/midpoint/commit/b2f514a8164535c53e7d2aa5d2101cd484aa8c53
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.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/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java

  Log Message:
  -----------
  Assignments conflicts panel, first working version


  Commit: 78e0b0177d3ef8ede5bbc3b1410d0acfae285880
      https://github.com/Evolveum/midpoint/commit/78e0b0177d3ef8ede5bbc3b1410d0acfae285880
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

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

  Log Message:
  -----------
  Assignments conflicts panel, finished for now


  Commit: 9029c2a1423460d15478abdc5374b7fc49eb290d
      https://github.com/Evolveum/midpoint/commit/9029c2a1423460d15478abdc5374b7fc49eb290d
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBoxPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/LiveSyncHandlerPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/LiveSyncHandlerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/ResourceRelatedHandlerDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_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 infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java

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


Compare: https://github.com/Evolveum/midpoint/compare/765ec9c7c59f...9029c2a14234