Axel Uhl 42bb1d7ac0 Merge branch 'master' into foiling ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java

Change-Id: I5f97a3c21e75e6d493c06dc87925d1273b0c4969

2016-07-05 12:47:39 +02:00

..

.settings

…

META-INF

changed authentication filter for sailing domain;

2016-03-08 22:15:49 +01:00

resources

increased Shiro session manager timeout from 30min to 24h

2016-04-20 18:00:19 +02:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into foiling

2016-07-05 12:47:39 +02:00

utils

…

WEB-INF

Added Bravo sensor data import functionality

2016-03-31 11:22:49 +02:00

webservices

changed the /api/v1/regattas/{regattaname}/races/{racename}/wind webservice so that a fromTime and toTime is mandatory

2016-06-21 16:18:44 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

main.css

Bug 2816: Changed more font-family declarations to use the new "Open

2015-05-26 15:02:38 +02:00

pom.xml

…