Fredrik Teschke b0668ecec8 Merge branch 'master' into gps-export ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml

2013-07-02 18:03:46 +02:00

..

.settings

…

com.google.gwt.osgi

…

com.googlecode.java-diff-utils

…

com.googlecode.java-diff-utils.test

…

com.mongodb.driver

…

com.sap.sailing.barbados.resultimport

…

com.sap.sailing.barbados.resultimport.test

…

com.sap.sailing.declination

…

com.sap.sailing.declination.test

…

com.sap.sailing.domain

moved BoatClassMasterdata back to where it belongs

2013-07-02 15:31:52 +02:00

com.sap.sailing.domain.common

Merge branch 'master' into gps-export

2013-07-02 18:03:46 +02:00

com.sap.sailing.domain.persistence

Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app

2013-06-27 19:04:53 +02:00

com.sap.sailing.domain.shared.android

added hotfix to solve problem with racecolumn reloading.

2013-06-27 18:56:43 +02:00

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

…

com.sap.sailing.domain.swisstimingadapter

…

com.sap.sailing.domain.swisstimingadapter.persistence

…

com.sap.sailing.domain.swisstimingadapter.test

…

com.sap.sailing.domain.swisstimingreplayadapter

…

com.sap.sailing.domain.swisstimingreplayadapter.test

…

com.sap.sailing.domain.test

enhanced logging for tests to better understand where it blocks if it blocks

2013-07-02 17:11:47 +02:00

com.sap.sailing.domain.tractracadapter

removed unused properties from RaceRecord

2013-06-26 19:34:36 +02:00

com.sap.sailing.domain.tractracadapter.persistence

…

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

…

com.sap.sailing.feature.p2build

…

com.sap.sailing.feature.runtime

edited feature.xml to include new bundles

2013-07-02 09:56:19 +02:00

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 gps-export

2013-07-02 18:03:46 +02:00

com.sap.sailing.gwt.ui.test

Adding isLive to mocks

2013-06-27 14:05:55 +02:00

com.sap.sailing.kiworesultimport

…

com.sap.sailing.kiworesultimport.test

…

com.sap.sailing.manage2sail.resultimport

fixed broken manage2sail result importer in case the isafId is "" instead of Null in json result description

2013-06-28 12:07:16 +02:00

com.sap.sailing.manage2sail.resultimport.test

…

com.sap.sailing.media.persistence.test

…

com.sap.sailing.mongodb

…

com.sap.sailing.mongodb.test

…

com.sap.sailing.monitoring

…

com.sap.sailing.nmeaconnector

…

com.sap.sailing.nmeaconnector.test

…

com.sap.sailing.operationaltransformation

…

com.sap.sailing.operationaltransformation.test

…

com.sap.sailing.resultimport

Extended the manage2sail result importer to support the 'gender' attribute from XRR to support regattas with the same boat class but different gender like 470 Men and 470 Women

2013-06-25 16:44:18 +02:00

com.sap.sailing.sailwave.resultimport

…

com.sap.sailing.sailwave.resultimport.test

…

com.sap.sailing.selenium.test

Make it possible to skip selenium tests

2013-06-25 12:27:07 +02:00

com.sap.sailing.server

Merge branch 'master' into gps-export

2013-07-02 18:03:46 +02:00

com.sap.sailing.server.gateway

Merge branch 'master' into gps-export

2013-07-02 18:03:46 +02:00

com.sap.sailing.server.gateway.ess40

…

com.sap.sailing.server.gateway.serialization

fixed another NPE in deserializer for nationality

2013-07-02 17:58:32 +02:00

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

Fixed merge problems after merge of master into import_dbdata

2013-06-29 10:54:13 +02:00

com.sap.sailing.server.gateway.test

quickly copy relevant wind fixes in WindJsonGetServlet to hold lock only shortly; started a test case which currently still fails

2013-06-21 22:02:39 +02:00

com.sap.sailing.server.replication

…

com.sap.sailing.server.replication.test

…

com.sap.sailing.server.test

Removed master data import post servlet

2013-07-02 13:08:15 +02:00

com.sap.sailing.server.trackfiles

resolved RouteConverter from target platform

2013-07-01 23:12:34 +02:00

com.sap.sailing.server.trackfiles.test

added export functionality

2013-06-28 19:10:17 +02:00

com.sap.sailing.simulator

…

com.sap.sailing.simulator.test

…

com.sap.sailing.targetplatform

…

com.sap.sailing.targetplatform.base

moved RouteConverter bundles into one, because of duplicate package name problems

2013-07-01 22:58:31 +02:00

com.sap.sailing.targetplatform.updater

…

com.sap.sailing.udpconnector

added log for UDPReceiver

2013-06-26 13:55:19 +02:00

com.sap.sailing.velum.resultimport

…

com.sap.sailing.velum.resultimport.test

…

com.sap.sailing.www

Add fix height to sapLogo.

2013-06-30 12:20:16 +02:00

com.sap.sailing.www.events

Added URLs of next events

2013-06-28 11:12:07 +02:00

com.sap.sailing.xcelsiusadapter

Hotfix for xcelsius export NPE

2013-06-25 11:40:23 +02:00

com.sap.sailing.xrr.resultimport

fixed broken sorting of imported races for XRR result importer

2013-06-26 17:32:25 +02:00

com.sap.sailing.xrr.resultimport.test

…

com.tractrac.clientmodule

…

net.sf.marineapi

…

net.sf.marineapi.test

…

org.json.simple

…

org.moxieapps.gwt.highcharts

…

org.openqa.selenium.osgi

…

target

Fixed logging path

2013-06-30 12:56:14 +02:00

.gitignore

…

CodeFormatter.xml

…

pom.xml

added export functionality

2013-06-28 19:10:17 +02:00