[midPoint-git] [Evolveum/midpoint] 6af8e0: MID-4697 assignments limit in the shopping cart gu...

[kate]

  Branch: refs/heads/support-3.8
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6af8e0266aabd1144f2d8a7ef98ecfb58f537a6f
      https://github.com/Evolveum/midpoint/commit/6af8e0266aabd1144f2d8a7ef98ecfb58f537a6f
  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
    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/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4697 assignments limit in the shopping cart gui part

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


  Commit: 74a46eb3ad582cffd4b6460a3ee3d4fccc033cc4
      https://github.com/Evolveum/midpoint/commit/74a46eb3ad582cffd4b6460a3ee3d4fccc033cc4
  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/objectdetails/AbstractRoleMainPanel.java

  Log Message:
  -----------
  merging fix


  Commit: e8276c5430bf4dc728c326df4020ecacbc11ac8e
      https://github.com/Evolveum/midpoint/commit/e8276c5430bf4dc728c326df4020ecacbc11ac8e
  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/resources/localization/Midpoint.properties

  Log Message:
  -----------
  MID-4697 assignments limit for assignments panel

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


  Commit: 199e4c0121f38a143ab399a31f4e8788e2b3fd64
      https://github.com/Evolveum/midpoint/commit/199e4c0121f38a143ab399a31f4e8788e2b3fd64
  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/objectdetails/AbstractRoleMainPanel.java

  Log Message:
  -----------
  merging fix


Compare: https://github.com/Evolveum/midpoint/compare/2bbef1ec4e52...199e4c0121f3
      **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.