[midPoint-git] [Evolveum/midpoint] afd360: fixing MID-3340 and MID-3917

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: afd360b53b4c9649bf4c2f8ecf5e0f5a3dec8d1e
      https://github.com/Evolveum/midpoint/commit/afd360b53b4c9649bf4c2f8ecf5e0f5a3dec8d1e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ReportCreateHandlerPanel.java

  Log Message:
  -----------
  fixing MID-3340 and MID-3917


  Commit: 18e39cec142d9d3937b2c8ec5ed793fe6e874665
      https://github.com/Evolveum/midpoint/commit/18e39cec142d9d3937b2c8ec5ed793fe6e874665
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DisplayableValueChoiceRenderer.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/resources/localization/schema.properties

  Log Message:
  -----------
  fix for MID-3972 (dropdown/enum for prism generated forms)


  Commit: 373e49b0db5158a2a6b1963c1de58d11f0ba519f
      https://github.com/Evolveum/midpoint/commit/373e49b0db5158a2a6b1963c1de58d11f0ba519f
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java

  Log Message:
  -----------
  fixing MID-3976 resource list


  Commit: b767bea02d686eeec67dfeeee7e42ac6d3e4a3bd
      https://github.com/Evolveum/midpoint/commit/b767bea02d686eeec67dfeeee7e42ac6d3e4a3bd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java

  Log Message:
  -----------
  javadoc for GetOperationOptions


  Commit: 113ff581b6b34eaff344bae6c5ea70b6fa4e9d52
      https://github.com/Evolveum/midpoint/commit/113ff581b6b34eaff344bae6c5ea70b6fa4e9d52
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/TestingPaths.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.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/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentCollection.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/CountingInspector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestNotoriousOrg.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java

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


Compare: https://github.com/Evolveum/midpoint/compare/3f0b942841e5...113ff581b6b3