[midPoint-git] [Evolveum/midpoint] f6d4b8: removing parentOrgRef from form..added organizatio...

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f6d4b8567fa5a302bc32df931ed7edfbbd384cba
      https://github.com/Evolveum/midpoint/commit/f6d4b8567fa5a302bc32df931ed7edfbbd384cba
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusProjectionDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusShadowDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  removing parentOrgRef from form..added organization panel instead.


  Commit: c9c0ed489b7ce50a0e151e17e7653f7a7c148a05
      https://github.com/Evolveum/midpoint/commit/c9c0ed489b7ce50a0e151e17e7653f7a7c148a05
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html

  Log Message:
  -----------
  fix for upload download panel


  Commit: 0c6c334076b30384e5c3ca6da1de4a6af3673fde
      https://github.com/Evolveum/midpoint/commit/0c6c334076b30384e5c3ca6da1de4a6af3673fde
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M config/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/99-user.ldif
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiConnector.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java

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


Compare: https://github.com/Evolveum/midpoint/compare/ee079a3c7d2a...0c6c334076b3