D049941 5953fe7d5d Merge remote-tracking branch 'origin/master' into riccardo-selenium ...

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch

2014-03-25 16:39:15 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

lib

New implementation for CellTables added which uses a generic approach,

2013-12-18 14:42:11 +01:00

META-INF

Selenium updated to version 2.40 and hamcrest bundle added to the

2014-03-21 15:50:41 +01:00

resources/com/sap/sailing/selenium/resources

Refactoring for the usage of the "Page Object" pattern and waiting for

2012-11-14 14:22:13 +01:00

src/com/sap/sailing/selenium

Merge remote-tracking branch 'origin/master' into riccardo-selenium

2014-03-25 16:39:15 +01:00

.classpath

New implementation for CellTables added which uses a generic approach,

2013-12-18 14:42:11 +01:00

.project

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

build.properties

New implementation for CellTables added which uses a generic approach,

2013-12-18 14:42:11 +01:00

ci-test-environment.xml

Screenshot folder should point to the right directory now.

2014-02-14 14:14:22 +01:00

com.sap.sailing.selenium.test (No Proxy, GWT Codesvr).launch

Merge branch 'master' into riccardo-selenium

2014-02-11 09:39:27 +01:00

com.sap.sailing.selenium.test (No Proxy).launch

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

com.sap.sailing.selenium.test (Proxy, GWT Codesvr).launch

Usage of the GWT-CodeServer simplified. The HostPage provides a method

2013-12-18 15:20:40 +01:00

com.sap.sailing.selenium.test (Proxy).launch

added Selenium launch configs to launch with Codesvr enabled, forcing the Firefox "Selenium" profile

2013-12-05 11:13:26 +01:00

local-test-environment.xml

Merge remote-tracking branch 'origin/master' into riccardo-selenium

2014-03-25 16:39:15 +01:00

pom.xml

Try to fixe the failing resolve of project dependencies.

2014-02-11 13:01:04 +01:00

test-environment-configuration.xsd

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00