[midPoint-git] [Evolveum/midpoint] f048c5: Back button is added to Import object page

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: f048c5942a2eb68eafdd3fe5dc92fabcfb71b697
      https://github.com/Evolveum/midpoint/commit/f048c5942a2eb68eafdd3fe5dc92fabcfb71b697
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java

  Log Message:
  -----------
  Back button is added to Import object page


  Commit: a965457c2927f687f6858c502f0a8c58fae90efc
      https://github.com/Evolveum/midpoint/commit/a965457c2927f687f6858c502f0a8c58fae90efc
  Author: honchar <honchar at evolveum.com>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestReconScript.java
    M model/model-impl/src/test/resources/common/user-elaine.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/mock/SynchornizationServiceMock.java
    M samples/resources/sap/assignment/sap-advanced.xml
    M samples/resources/sap/sap-advanced.xml
    M samples/resources/sap/sap-medium.xml
    M samples/stories/multitenant-idm-saas/readme.txt
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-admin.xml
    M samples/stories/multitenant-idm-saas/roles/role-customer-authz-enduser.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java

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


Compare: https://github.com/Evolveum/midpoint/compare/76daa0e29a21...a965457c2927