[midPoint-git] [Evolveum/midpoint] 0a1820: Adapt TestConsistencyMechanism story test

[Brandon Powers]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0a1820c1a20346ce428c89555d708d7963c5186d
      https://github.com/Evolveum/midpoint/commit/0a1820c1a20346ce428c89555d708d7963c5186d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java

  Log Message:
  -----------
  Adapt TestConsistencyMechanism story test


  Commit: f2350962fa18f5139a92d9f9f0b661ab6aeea179
      https://github.com/Evolveum/midpoint/commit/f2350962fa18f5139a92d9f9f0b661ab6aeea179
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SwitchAssignmentTypePanel.java

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


  Commit: f0a06e1d796c988545df8398f07b7fdac744e277
      https://github.com/Evolveum/midpoint/commit/f0a06e1d796c988545df8398f07b7fdac744e277
  Author: Brandon Powers <bpowers1215 at gmail.com>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Fix close case work item output delta

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

# Conflicts:
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java


  Commit: e8c3e60236e04aed44a1a4a5d1e285e9a05436e8
      https://github.com/Evolveum/midpoint/commit/e8c3e60236e04aed44a1a4a5d1e285e9a05436e8
  Author: Brandon Powers <bpowers1215 at gmail.com>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Fix saving evidence when closing case work item


Compare: https://github.com/Evolveum/midpoint/compare/e1b01fe1f89b...e8c3e60236e0