Armin Zamani 6b4efe7af5 Merge branch 'master' into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonExportServlet.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java

2013-03-22 13:51:55 +01:00

..

.settings

…

com.google.gwt.osgi

…

com.googlecode.java-diff-utils

…

com.googlecode.java-diff-utils.test

…

com.mongodb.driver

…

com.sap.sailing.declination

added NOAA importer launch configurations for declination import into resources/

2013-03-20 00:33:50 +01:00

com.sap.sailing.declination.test

…

com.sap.sailing.domain

Merge branch 'master' into racecommittee_integrated

2013-03-22 13:51:55 +01:00

com.sap.sailing.domain.common

Merge branch 'master' into racecommittee_integrated

2013-03-19 22:05:33 +01:00

com.sap.sailing.domain.persistence

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.domain.shared.android

Merge branch 'master' into racecommittee_integrated

2013-03-22 10:42:10 +01:00

com.sap.sailing.domain.shared.android.test

# added tests for racelog and comparator

2013-03-05 12:11:25 +01:00

com.sap.sailing.domain.swisstimingadapter

improved trace output for locking

2013-03-21 17:43:23 +01:00

com.sap.sailing.domain.swisstimingadapter.persistence

added "ascending" flag for SwissTiming messages collection index

2013-03-19 15:13:41 +01:00

com.sap.sailing.domain.swisstimingadapter.test

…

com.sap.sailing.domain.swisstimingreplayadapter

…

com.sap.sailing.domain.swisstimingreplayadapter.test

…

com.sap.sailing.domain.test

Merge branch 'master' into racecommittee_integrated

2013-03-22 10:42:10 +01:00

com.sap.sailing.domain.tractracadapter

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.domain.tractracadapter.persistence

Added the tracTrac Course Update url entry field to the tractrac admin

2013-03-20 17:19:03 +01:00

com.sap.sailing.domain.tractracadapter.test

…

com.sap.sailing.ess40.resultimport

…

com.sap.sailing.ess40.resultimport.test

…

com.sap.sailing.expeditionconnector

…

com.sap.sailing.expeditionconnector.test

…

com.sap.sailing.feature

added the XRR result importer bundle to the feature and product and set it to auto-start

2013-03-19 11:40:34 +01:00

com.sap.sailing.feature.p2build

added the XRR result importer bundle to the feature and product and set it to auto-start

2013-03-19 11:40:34 +01:00

com.sap.sailing.feature.runtime

…

com.sap.sailing.freg.resultimport

…

com.sap.sailing.freg.resultimport.test

…

com.sap.sailing.geocoding

…

com.sap.sailing.geocoding.test

…

com.sap.sailing.gwt.ui

Merge branch 'master' into racecommittee_integrated

2013-03-22 10:42:10 +01:00

com.sap.sailing.gwt.ui.test

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.kiworesultimport

…

com.sap.sailing.kiworesultimport.test

…

com.sap.sailing.media.persistence.test

…

com.sap.sailing.mongodb

…

com.sap.sailing.mongodb.test

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.monitoring

Never use default instance, always create a new one because it can happen that upon bundle reinstall the session context has changed and the authenticator will deny access because object id will have changed

2013-03-06 08:20:30 +01:00

com.sap.sailing.nmeaconnector

…

com.sap.sailing.nmeaconnector.test

…

com.sap.sailing.odf.resultimport

adapted ODF parser to ScoreCorecctionProvider interface; added a first set of tests

2013-03-13 14:55:58 +01:00

com.sap.sailing.odf.resultimport.test

added DSQ test to ODF ScoreCorrectionProvider tests

2013-03-13 19:38:40 +01:00

com.sap.sailing.operationaltransformation

…

com.sap.sailing.operationaltransformation.test

…

com.sap.sailing.selenium.test

started a Selenium UI test for leaderboard creation

2013-03-15 13:30:33 +01:00

com.sap.sailing.server

Merge branch 'master' into racecommittee_integrated

2013-03-22 13:51:55 +01:00

com.sap.sailing.server.gateway

Merge branch 'master' into racecommittee_integrated

2013-03-22 13:51:55 +01:00

com.sap.sailing.server.gateway.ess40

improved the leaderboard csv export by exporting the displayName of a competitor (instead of name) if one exist

2013-03-05 15:35:18 +01:00

com.sap.sailing.server.gateway.serialization

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.server.gateway.serialization.test

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.server.gateway.test

fixed missing method renaming

2013-03-22 10:58:30 +01:00

com.sap.sailing.server.replication

Made sure that event is correctly replicated upon initial load, also

2013-03-05 11:10:54 +01:00

com.sap.sailing.server.replication.test

fixed a couple of merge errors

2013-03-21 22:11:57 +01:00

com.sap.sailing.server.test

introduced the course design update URI as part of the constructors for

2013-03-20 19:31:23 +01:00

com.sap.sailing.targetplatform

…

com.sap.sailing.targetplatform.base

…

com.sap.sailing.targetplatform.updater

…

com.sap.sailing.udpconnector

…

com.sap.sailing.www

added missing favicon to html pages

2013-03-11 16:11:53 +01:00

com.sap.sailing.www.events

cleanup of outdated ESS html pages

2013-03-11 17:46:57 +01:00

com.sap.sailing.xcelsiusadapter

…

com.sap.sailing.xrr.resultimport

fixing issue with selection of XRR document if multiple matches with different time points exist

2013-03-20 10:44:12 +01:00

com.sap.sailing.xrr.resultimport.test

adjusted XRR import test verdicts after fixing the event name / boat class name mix-up

2013-03-19 22:42:27 +01:00

com.tractrac.clientmodule

…

net.sf.marineapi

…

net.sf.marineapi.test

…

org.json.simple

…

org.moxieapps.gwt.highcharts

…

org.openqa.selenium.osgi

…

target

…

.gitignore

…

CodeFormatter.xml

…

pom.xml

Merge branch 'master' into racecommittee_integrated

2013-03-22 13:51:55 +01:00