[midPoint-git] [Evolveum/midpoint] b5eabc: MID-2659 is fixed

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: b5eabcd382a33f0508ccd59131e066a364f08781
      https://github.com/Evolveum/midpoint/commit/b5eabcd382a33f0508ccd59131e066a364f08781
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

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

  Log Message:
  -----------
  MID-2659 is fixed


  Commit: 6b7cd261af7e296e06722eb28a4b9b6b4ee4444b
      https://github.com/Evolveum/midpoint/commit/6b7cd261af7e296e06722eb28a4b9b6b4ee4444b
  Author: honchar <honchar at evolveum.com>
  Date:   2015-11-03 (Tue, 03 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.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/SchemaTransformer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/story/src/test/resources/village/role-basic.xml
    M testing/wstest/src/test/resources/common/resource-opendj.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/f1d3f81fa042...6b7cd261af7e