Axel Uhl e599e80f9a Merge branch 'ubilabs--rcapp--bug_3011' ...

Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java

Change-Id: If2fa033a2c1defc00ec9a4bec4a31877c7c28fb6

2016-04-25 20:27:36 +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 'ubilabs--rcapp--bug_3011'

2016-04-25 20:27:36 +02:00

utils

…

WEB-INF

Merge branch 'master' into bug2589

2016-01-04 11:34:01 +01:00

webservices

added race column factor services on LeaderboardsResource which now requires authentication for setting the column factor

2016-04-05 13:11:32 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

main.css

…

pom.xml

…