[midPoint-git] [Evolveum/midpoint] 2e1130: adding missing resources - new files for servicety...

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2e11301e71d5dd3c903a7d7a8748c6e4589ffee4
      https://github.com/Evolveum/midpoint/commit/2e11301e71d5dd3c903a7d7a8748c6e4589ffee4
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageAdminServices.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ServiceSummaryPanel.java

  Log Message:
  -----------
  adding missing resources - new files for servicetype pages..


  Commit: 79985c315ef5bee8f9212cea8af23fe348f088c7
      https://github.com/Evolveum/midpoint/commit/79985c315ef5bee8f9212cea8af23fe348f088c7
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/d6fb6de72b7b...79985c315ef5