eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-13 07:40:58 +00:00
Code Activity
Files
524b67dacdce0346e4f26f3fc86262673f64d7ef
sailing-analytics/java
T
History
Axel Uhl 524b67dacd Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts 
Conflicts:
	java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
	java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
	java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ResultImportUrlsManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	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.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/CompetitorRowImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/DefaultCompetitorEntryImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/RegattaScoreCorrectionsImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
	java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForRaceImpl.java
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/pom.xml
2013-04-12 16:09:54 +02:00
..
.settings
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.google.gwt.osgi
upgraded gwt version from 2.5.0 to 2.5.1
2013-04-12 11:44:45 +02:00
com.googlecode.java-diff-utils
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.googlecode.java-diff-utils.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.mongodb.driver
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.declination
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.declination.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain
changed name for mark passings locks
2013-04-12 13:05:07 +02:00
com.sap.sailing.domain.common
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.persistence
Changed getTrackedRegatta.getRegatta.getId to the tractrac event id,
2013-04-12 16:40:49 +08:00
com.sap.sailing.domain.shared.android
Merge branch 'master' into racecommittee_integrated
2013-04-11 13:39:51 +08:00
com.sap.sailing.domain.shared.android.test
added missing hamcrest dependency to android.test bundle
2013-04-11 16:00:37 +02:00
com.sap.sailing.domain.swisstimingadapter
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.swisstimingadapter.persistence
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.swisstimingadapter.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.swisstimingreplayadapter
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.swisstimingreplayadapter.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.test
Merge branch 'master' into racecommittee_integrated
2013-04-11 13:39:51 +08:00
com.sap.sailing.domain.tractracadapter
Changed getTrackedRegatta.getRegatta.getId to the tractrac event id,
2013-04-12 16:40:49 +08:00
com.sap.sailing.domain.tractracadapter.persistence
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.domain.tractracadapter.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.ess40.resultimport
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.ess40.resultimport.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.expeditionconnector
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.expeditionconnector.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.feature
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.feature.p2build
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.feature.runtime
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.freg.resultimport
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.freg.resultimport.test
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.geocoding
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.geocoding.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.gwt.ui
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.gwt.ui.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.kiworesultimport
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.kiworesultimport.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.media.persistence.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.mongodb
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.mongodb.test
added missing hamcrest dependency to manifest of mongodb.test bundle
2013-04-11 15:20:27 +02:00
com.sap.sailing.monitoring
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.nmeaconnector
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.nmeaconnector.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.odf.resultimport
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.odf.resultimport.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.operationaltransformation
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.operationaltransformation.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.resultimport
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.selenium.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.server
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00
com.sap.sailing.server.gateway
Merge branch 'master' into racecommittee_integrated
2013-04-11 13:39:51 +08:00
com.sap.sailing.server.gateway.ess40
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.server.gateway.serialization
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.server.gateway.serialization.test
added missing hamcrest dependency to serialization.test manifest
2013-04-11 14:46:43 +02:00
com.sap.sailing.server.gateway.test
Merge remote-tracking branch 'server/master'
2013-04-11 14:13:34 +02:00
com.sap.sailing.server.replication
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.server.replication.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.server.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.targetplatform
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.targetplatform.base
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.targetplatform.updater
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.udpconnector
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.winregatta.resultimport
first test for parsing XLSX result format for 505 in Barbados
2013-04-11 00:09:10 +02:00
com.sap.sailing.winregatta.resultimport.test
first test for parsing XLSX result format for 505 in Barbados
2013-04-11 00:09:10 +02:00
com.sap.sailing.www
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.www.events
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.xcelsiusadapter
fixed how the boat class name is determined for a leaderboard in xcelsiusadapter, no longer requiring it to be a RegattaLeaderboard
2013-04-12 15:09:08 +02:00
com.sap.sailing.xrr.resultimport
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.sap.sailing.xrr.resultimport.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
com.tractrac.clientmodule
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
net.sf.marineapi
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
net.sf.marineapi.test
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
org.json.simple
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
org.moxieapps.gwt.highcharts
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
org.openqa.selenium.osgi
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
target
adjusted start script to use telnet port and nohup
2013-04-12 13:05:18 +02:00
.gitignore
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
CodeFormatter.xml
Merge branch 'racecommittee_integrated' of
2013-04-11 00:28:12 +02:00
pom.xml
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
2013-04-12 16:09:54 +02:00