[midPoint-git] [Evolveum/midpoint] d9fb8d: lockout panel is returned back

[kate]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: d9fb8d4cda2bf893bb02f447630b6b1da55ab697
      https://github.com/Evolveum/midpoint/commit/d9fb8d4cda2bf893bb02f447630b6b1da55ab697
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/LockoutStatusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  lockout panel is returned back


  Commit: b5a62868357fd4514cdeb1e3e1dc8f51ec0f1697
      https://github.com/Evolveum/midpoint/commit/b5a62868357fd4514cdeb1e3e1dc8f51ec0f1697
  Author: kate <honchar at evolveum.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationEventListener.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertEventHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertReviewEvent.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/CertificationListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleReviewerNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/811305990e77...b5a62868357f