D049941 5b9d469d5b Merge branch 'master-for-merge' ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
	java/com.sap.sailing.selenium.test/local-test-environment.xml
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java

2013-12-10 15:49:40 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

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

lib

New query/predicate framework added to easily retrieve entries from

2013-10-24 14:02:05 +02:00

META-INF

New query/predicate framework added to easily retrieve entries from

2013-10-24 14:02:05 +02: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 branch 'master-for-merge'

2013-12-10 15:49:40 +01:00

.classpath

New query/predicate framework added to easily retrieve entries from

2013-10-24 14:02:05 +02:00

.project

Merge branch 'racecommittee_integrated' of

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

build.properties

Issue with bin.includes fixed.

2013-10-25 15:55:37 +02:00

ci-test-environment.xml

fixed uncommenting of Firefox driver

2013-11-06 08:35:13 +01:00

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

added launch config to run Selenium tests against gwt.codesvr UI; expect Firefox "Selenium" profile

2013-11-27 14:17:45 +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

Merge branch 'master-for-merge'

2013-12-10 15:49: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-eclipse.xml

Selenium updated to version 2.37.0

2013-10-24 16:37:01 +02:00

local-test-environment-maven.xml

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

2013-11-22 16:15:07 +01:00

local-test-environment.xml

Merge branch 'master-for-merge'

2013-12-10 15:49:40 +01:00

pom.xml

Merge remote-tracking branch 'external/master' into riccardo

2013-10-24 15:52:16 +02:00

test-environment-configuration.xsd

Merge branch 'racecommittee_integrated' of

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