[midPoint-git] [Evolveum/midpoint] 5ed094: no-error assignment conflicts. npe in role catalog...

honchar honchar at evolveum.com
Wed Feb 22 22:20:49 CET 2017 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5ed094e6ed0d365487e3ac0a7176951efbf99ad1
      https://github.com/Evolveum/midpoint/commit/5ed094e6ed0d365487e3ac0a7176951efbf99ad1
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java

  Log Message:
  -----------
  no-error assignment conflicts. npe in role catalog is fixed


  Commit: 0a42d317fe3d363d9fa617c0dac70add5d49bfad
      https://github.com/Evolveum/midpoint/commit/0a42d317fe3d363d9fa617c0dac70add5d49bfad
  Author: honchar <honchar at evolveum.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/hide-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/image.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/list-group.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/pagination.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/reset-text.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/responsive-visibility.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/text-emphasis.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/vendor-prefixes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/variables.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/.csslintrc
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/404_500_errors.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE-without-plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/AdminLTE.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/alerts.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/bootstrap-social.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/boxes.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/buttons.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/control-sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/core.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/direct-chat.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/dropdown.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/forms.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/fullcalendar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/header.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/labels.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/lockscreen.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/login_and_register.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mailbox.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/miscellaneous.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/mixins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/modal.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/navs.less
    A gui/admin-gui/src/main/webapp/less/admin-lte/less/plugins.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/print.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/products.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/profile.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/progress-bars.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/select2.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar-mini.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/sidebar.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-black.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-blue-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-green.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-purple.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-red.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow-light.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/skins/skin-yellow.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/small-box.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/social-widgets.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/timeline.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/users-list.less
    M gui/admin-gui/src/main/webapp/less/admin-lte/less/variables.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/FullTextFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_Filter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_AtomicFilterEntry.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    A infra/prism/src/test/resources/query/filter-not-full-text.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationApiConstants.java
    M model/certification-impl/pom.xml
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/BaseCertificationHandler.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/ExclusionCertificationHandler.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
    A model/certification-impl/src/test/resources/sod/a-test-2a.xml
    A model/certification-impl/src/test/resources/sod/a-test-2b.xml
    A model/certification-impl/src/test/resources/sod/a-test-3a.xml
    A model/certification-impl/src/test/resources/sod/a-test-3b.xml
    A model/certification-impl/src/test/resources/sod/a-test-3x.xml
    A model/certification-impl/src/test/resources/sod/a-test-3y.xml
    A model/certification-impl/src/test/resources/sod/sod-certification.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/0bccdae7e0d6...0a42d317fe3d

More information about the midPoint-svn mailing list