[midPoint-git] [Evolveum/midpoint] e699aa: Fixing intolerantValuePattern (for associations; a...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: e699aaa7e2f9a247a2f396ea1975ed1c3d9d783d
      https://github.com/Evolveum/midpoint/commit/e699aaa7e2f9a247a2f396ea1975ed1c3d9d783d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java

  Log Message:
  -----------
  Fixing intolerantValuePattern (for associations; attributes remain to be fixed).


  Commit: fc369e48fbc4b3436b05b8a8d94642290261d5b5
      https://github.com/Evolveum/midpoint/commit/fc369e48fbc4b3436b05b8a8d94642290261d5b5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Tests for previous fix.


  Commit: 56e41a4552a3626df77921b3997766073749d92d
      https://github.com/Evolveum/midpoint/commit/56e41a4552a3626df77921b3997766073749d92d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-02-18 (Sat, 18 Feb 2017)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflict.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentConflictDto.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/800f5aeaf85c...56e41a4552a3