[midPoint-git] [Evolveum/midpoint] 958b64: adding option import file as string for import rep...

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 958b646a607cf6f32c58bb1f86e8d7763015506d
      https://github.com/Evolveum/midpoint/commit/958b646a607cf6f32c58bb1f86e8d7763015506d
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ImportReportPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/controller/engine/EngineController.java

  Log Message:
  -----------
  adding option import file as string for import report (MID-6426)


  Commit: d64021b28df8c4432280e311c76b1833e1d706a5
      https://github.com/Evolveum/midpoint/commit/d64021b28df8c4432280e311c76b1833e1d706a5
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
    M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
    M gui/admin-gui/src/main/resources/initial-objects/050-user-administrator.xml
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/AbstractSpringTest.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/exception/IndestructibilityViolationException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/AbstractMiscTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMigration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestUuidNonUniqueName.java
    M model/model-intest/src/test/resources/common/user-administrator.xml
    M model/model-intest/src/test/resources/misc/user-skellington.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/JdbcSession.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/AssignmentHolderAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/FocusAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/SimpleMidpointTestContext.java

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


Compare: https://github.com/Evolveum/midpoint/compare/bb97b4ed5fcb...d64021b28df8