[midPoint-git] [Evolveum/midpoint] c005e5: reworking list resource page..

[Katarina Valalikova]

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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceOld.java
    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
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java

  Log Message:
  -----------
  reworking list resource page..


  Commit: b544c7bbe101b1cd2fe85e729fb0367f0e422169
      https://github.com/Evolveum/midpoint/commit/b544c7bbe101b1cd2fe85e729fb0367f0e422169
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.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/6149ac9aec45...b544c7bbe101