[midPoint-git] [Evolveum/midpoint] 35d25e: title for target object column in the work items t...

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 35d25e1da5f421dd9d4f80c0edc8ae2d99a77ffe
      https://github.com/Evolveum/midpoint/commit/35d25e1da5f421dd9d4f80c0edc8ae2d99a77ffe
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.html
    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/wf/WorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  title for target object column in the work items table
Add to cart button is added to abstract role details page


  Commit: f8dbeaa68d19211648870b33bc64091815822166
      https://github.com/Evolveum/midpoint/commit/f8dbeaa68d19211648870b33bc64091815822166
  Author: honchar <honchar at evolveum.com>
  Date:   2017-05-26 (Fri, 26 May 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    M samples/evolveum/hr.csv
    M samples/evolveum/resource-hr.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java


Compare: https://github.com/Evolveum/midpoint/compare/1e0cd2190a2b...f8dbeaa68d19