[midPoint-git] [Evolveum/midpoint] 8e4519: new pages for serviceType..

[Katarina Valalikova]

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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  new pages for serviceType..


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskButtonsVisibility.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskShowAdvancedFeaturesPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskShowAdvancedFeaturesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTabsVisibility.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

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

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint.properties


Compare: https://github.com/Evolveum/midpoint/compare/61517e76c967...5d65cffaa475