[midPoint-git] [Evolveum/midpoint] 60eecd: Improving assignable popups + fixing searches + st...

[erik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 60eecdf362cb58ec974784b7db1d21b53f7b70f3
      https://github.com/Evolveum/midpoint/commit/60eecdf362cb58ec974784b7db1d21b53f7b70f3
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

  Changed paths:
    A 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/assignment/AssignmentSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePannel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePannel.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/AssignableOrgPopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java

  Log Message:
  -----------
  Improving assignable popups + fixing searches + styles


  Commit: ee244c3a090e1a06b3a091a2021d1ac1fc7dc869
      https://github.com/Evolveum/midpoint/commit/ee244c3a090e1a06b3a091a2021d1ac1fc7dc869
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/gensync/lookup-languages-replacement.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java


Compare: https://github.com/Evolveum/midpoint/compare/7d287048d2f5...ee244c3a090e