[midPoint-git] [Evolveum/midpoint] 04534f: resource list menu items update

[kate]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 04534fe858054a84ac6970264d416ce46a216df2
      https://github.com/Evolveum/midpoint/commit/04534fe858054a84ac6970264d416ce46a216df2
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-05 (Wed, 05 Sep 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  resource list menu items update


  Commit: 6ed8e1bc94b53ad1c888a860c9a3314107516d9f
      https://github.com/Evolveum/midpoint/commit/6ed8e1bc94b53ad1c888a860c9a3314107516d9f
  Author: kate <honchar at evolveum.com>
  Date:   2018-09-05 (Wed, 05 Sep 2018)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/request/herman.ldif

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


Compare: https://github.com/Evolveum/midpoint/compare/d6292dacc433...6ed8e1bc94b5
      **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.