[midPoint-git] [Evolveum/midpoint] 953c2f: connected with fix of MID-2655 (just reverting Adm...

[Radovan Semancik]

  Branch: refs/heads/access-certification
  Home:   https://github.com/Evolveum/midpoint
  Commit: 953c2fc487d0521a03563c26e203db97c29aba54
      https://github.com/Evolveum/midpoint/commit/953c2fc487d0521a03563c26e203db97c29aba54
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css

  Log Message:
  -----------
  connected with fix of MID-2655 (just reverting AdminLTE.min.css to its previous state)


  Commit: 64c4cb17ec71c9d5c22b18daa8b3db2bfaec88b1
      https://github.com/Evolveum/midpoint/commit/64c4cb17ec71c9d5c22b18daa8b3db2bfaec88b1
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css

  Log Message:
  -----------
  again reverting AdminLTE.min.css to its previous state


  Commit: a9cd540f9e2426a19082853d84f1cc9b7b2868a8
      https://github.com/Evolveum/midpoint/commit/a9cd540f9e2426a19082853d84f1cc9b7b2868a8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  Fixed serialization/parsing of OrgFilter. Hopefully fixing MID-2400.


  Commit: a81d1c692a6f2245f30ef12208162ddaf5c3ddf9
      https://github.com/Evolveum/midpoint/commit/a81d1c692a6f2245f30ef12208162ddaf5c3ddf9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ResourceListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    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/ItemWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseDeprecatedPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePageAwarePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
    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/configuration/component/ObjectSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractAssignableSelectionPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointProfilingServletFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java

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


  Commit: 9276e5276f14c701cd65765b495ef312887527e0
      https://github.com/Evolveum/midpoint/commit/9276e5276f14c701cd65765b495ef312887527e0
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/js/ace/ace.js
    M gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less

  Log Message:
  -----------
  reverting ace.js  to its previous state


  Commit: 803287b74a1771488ca260e41478e2994a321b26
      https://github.com/Evolveum/midpoint/commit/803287b74a1771488ca260e41478e2994a321b26
  Author: honchar <honchar at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

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


  Commit: 2ee873ac621240f59e596ae9dffec55685e359a0
      https://github.com/Evolveum/midpoint/commit/2ee873ac621240f59e596ae9dffec55685e359a0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-assign-requestable-roles.xml
    M model/model-intest/src/test/resources/security/role-business-1.xml
    A model/model-intest/src/test/resources/security/role-business-2.xml

  Log Message:
  -----------
  Fixing NPE in RoleSelectionSpecEntry.hasNegative()


  Commit: 0edad99ca813b180e40103f0b023cd39bb50f69b
      https://github.com/Evolveum/midpoint/commit/0edad99ca813b180e40103f0b023cd39bb50f69b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/webapp/css/admin-lte/AdminLTE.min.css
    M gui/admin-gui/src/main/webapp/js/ace/ace.js
    M gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-assign-requestable-roles.xml
    M model/model-intest/src/test/resources/security/role-business-1.xml
    A model/model-intest/src/test/resources/security/role-business-2.xml

  Log Message:
  -----------
  Merge branch 'master' into access-certification


Compare: https://github.com/Evolveum/midpoint/compare/4a7751542084...0edad99ca813