[midPoint-git] [Evolveum/midpoint] 9ba082: changes to selenide module

[honchar]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 9ba082aa5a5213757be63e9f13578a99d582693d
      https://github.com/Evolveum/midpoint/commit/9ba082aa5a5213757be63e9f13578a99d582693d
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/ResourceUserAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/CsvAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/organization/OrganizationStructureTests.java

  Log Message:
  -----------
  changes to selenide module


  Commit: 91dc3a2bc7462e245e87ca81a098168bbaf551ff
      https://github.com/Evolveum/midpoint/commit/91dc3a2bc7462e245e87ca81a098168bbaf551ff
  Author: honchar <honchar at evolveum.com>
  Date:   2015-10-29 (Thu, 29 Oct 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/ResourceUserAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/CsvAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/EndUserTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/OrganizationTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/RoleTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/SimpleUserTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/organization/OrganizationStructureTests.java
    A testing/selenidetest/src/test/resources/mp-resources/midpoint-flatfile-orig.csv
    M testing/selenidetest/testng-integration.xml

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

Conflicts:
	testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java
	testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/ResourceUserAccountTests.java


Compare: https://github.com/Evolveum/midpoint/compare/ac425acb8010...91dc3a2bc746