 Axel Uhl
|
7fb0dfcf99
|
Merge branch 'master' into tracapi
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
|
2014-06-03 01:47:08 +02:00 |
|
|
Axel Uhl
|
1eed921f29
|
completed the merge after Fredrik had introduced more Util.Pair usages on master
|
2014-06-03 01:15:49 +02:00 |
|
|
Axel Uhl
|
c38a59c518
|
Merge branch 'master' into search
|
2014-06-03 01:11:54 +02:00 |
|
|
Axel Uhl
|
2157f02c5b
|
Merge branch 'master' into search
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/servlet/RecordFixesPostServlet.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java
|
2014-06-03 01:10:25 +02:00 |
|
 Fredrik Teschke
|
33d953996e
|
Merge branch 'master' of sapsailing.com:/home/trac/git
|
2014-06-03 01:09:46 +02:00 |
|
|
Fredrik Teschke
|
a24c8764a6
|
fix testcase which failed due to old KML withouth timestamps
|
2014-06-03 01:08:56 +02:00 |
|
|
Axel Uhl
|
4fd16295a1
|
fixed test case testKmlOnlyLatLong by avoiding NPE in case no date is provided with a fix, as in a KML file
|
2014-06-03 01:07:46 +02:00 |
|
|
Fredrik Teschke
|
24787bd9bf
|
add metadata collection for GPSFixStore
|
2014-06-03 00:52:54 +02:00 |
|
|
Fredrik Teschke
|
492d2970bf
|
use TrackFileImportDeviceId in GPSFixImporter callback instead of generic DeviceId
|
2014-06-03 00:51:56 +02:00 |
|
|
Axel Uhl
|
e5d99b38a9
|
started implementing a RegattaByKeywordSearchService
|
2014-06-03 00:46:55 +02:00 |
|
|
Axel Uhl
|
6b4f2eecab
|
moved AbstractListFilter and related UI components to com.sap.sse.common and com.sap.sse.gwt, respectively
|
2014-06-03 00:13:41 +02:00 |
|
|
Axel Uhl
|
53a0b36e8e
|
consolidated all Util stuff in com.sap.sse.common.Util now
|
2014-06-03 00:01:14 +02:00 |
|
|
Axel Uhl
|
cb9354b1a0
|
moved Util from com.sap.sailing.common to com.sap.sse.common
|
2014-06-02 23:57:16 +02:00 |
|
|
Axel Uhl
|
f9bdd96d55
|
pulled up the remaining methods from com.sap.sailing.common.Util to com.sap.sse.common.Util
|
2014-06-02 23:54:14 +02:00 |
|
|
Axel Uhl
|
ed8ab3d5ad
|
moved Named to com.sap.sse.common
|
2014-06-02 23:53:36 +02:00 |
|
|
Axel Uhl
|
5b038779db
|
pulled up all but the Named-related methods from com.sap.sailing.common.Util to com.sap.sse.common.Util; further prepared for Regatta search on RacingEventService
|
2014-06-02 23:51:49 +02:00 |
|
|
Axel Uhl
|
0c47e86304
|
moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common
|
2014-06-02 23:31:26 +02:00 |
|
|
Axel Uhl
|
c4cea6660d
|
introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util
|
2014-06-02 23:17:49 +02:00 |
|
|
Axel Uhl
|
0d152be05c
|
moved redundant Pair and Triple classes to a new com.sap.sse.common.Util class, preparing for unification with com.sap.sailing.common.Util
|
2014-06-02 23:03:05 +02:00 |
|
|
Fredrik Teschke
|
a3e2214cdb
|
Merge branch 'master' of sapsailing.com:/home/trac/git
|
2014-06-02 22:05:42 +02:00 |
|
|
Fredrik Teschke
|
696484f194
|
changed interface of GPSFixImporter, so that the importer generates the device identifier
|
2014-06-02 22:05:31 +02:00 |
|
|
Axel Uhl
|
59cacabd78
|
Merge remote-tracking branch 'server/master'
|
2014-06-02 21:48:38 +02:00 |
|
|
Axel Uhl
|
a3266a4765
|
ensure that UUID.randomUUID() is not called within GWT code; it's not supported by the emulation
|
2014-06-02 21:46:52 +02:00 |
|
|
Fredrik Teschke
|
3b4f71114b
|
Merge branch 'master' of sapsailing.com:/home/trac/git
|
2014-06-02 20:56:26 +02:00 |
|
|
Fredrik Teschke
|
7dbf0857cc
|
removed non-existent resources folder from build.properties
|
2014-06-02 20:56:06 +02:00 |
|
|
Axel Uhl
|
dfcc5d138c
|
Merge remote-tracking branch 'server/master'
|
2014-06-02 20:51:07 +02:00 |
|
|
Axel Uhl
|
55553f39b4
|
fixed serialization of EventDTO by making LeaderboardGroups collection non-final
|
2014-06-02 20:46:08 +02:00 |
|
|
Axel Uhl
|
e1d6aabe17
|
fixing an endless recursion in the generation of EventDTOs
|
2014-06-02 20:22:49 +02:00 |
|
|
Fredrik Teschke
|
883a9d1458
|
Merge remote-tracking branch 'origin/master'
|
2014-06-02 20:12:47 +02:00 |
|
|
Fredrik Teschke
|
f7df3a7aca
|
read GPX extensions without JAXB unmarshalling them
|
2014-06-02 20:12:18 +02:00 |
|
|
Axel Uhl
|
590032d7f3
|
fixed test fixture for event serialization by adding leaderboard groups collection
|
2014-06-02 20:11:51 +02:00 |
|
|
Fredrik Teschke
|
4c6f064c33
|
add testcase to see if GPX extensions can be accessed from RouteConverter
|
2014-06-02 20:10:29 +02:00 |
|
|
Axel Uhl
|
4e6f1e9a6f
|
Split EventDTO into EventBaseDTO and EventDTO; EventBaseDTO uses LeaderboardGroupBaseDTOs, EventDTO uses LeaderboardGroupDTOs
|
2014-06-02 18:22:11 +02:00 |
|
|
Axel Uhl
|
54cc5f09d4
|
fixed links to Legal Disclosure and Privacy for the SAP home page
|
2014-06-02 18:07:15 +02:00 |
|
|
Axel Uhl
|
62e664ad8d
|
fill the EventDTO.baseURL field bsaed on the request URL and the remote server reference URLs
|
2014-06-02 16:47:21 +02:00 |
|
|
Axel Uhl
|
f65533cef2
|
fixed compile errors regarding LeaderboardGroupBase JSON serialization; added baseURL to EventDTO
|
2014-06-02 16:41:00 +02:00 |
|
|
Axel Uhl
|
0fee219a73
|
avoid warnings
|
2014-06-02 15:36:08 +02:00 |
|
|
Axel Uhl
|
6ecc711ea6
|
stripped leaderboard group (ID, name, description) is now JSON-serialized with Event
|
2014-06-02 15:32:24 +02:00 |
|
|
Axel Uhl
|
8e23b60837
|
Merge remote-tracking branch 'server/master'
|
2014-06-02 14:34:15 +02:00 |
|
|
Axel Uhl
|
ceb7cd7f0a
|
ignore 0/0 COG/SOG values and determine getEstimatedSpeed() for those only based on inter-fix calculation
|
2014-06-02 14:06:02 +02:00 |
|
|
Axel Uhl
|
6fa05d6242
|
fixing bug 1980: MinMaxRenderer now only takes into account those rows actually displayed by the leaderboard
|
2014-06-02 09:40:46 +02:00 |
|
|
Axel Uhl
|
4ed723d57e
|
added an example URL for the viewShowMapControls parameter
|
2014-06-01 16:13:10 +02:00 |
|
|
Axel Uhl
|
85a3f599e9
|
added hint to release notes explaining the viewShowMapControls parameter and the Highcharts upgrade
|
2014-06-01 16:06:58 +02:00 |
|
|
Axel Uhl
|
94952827ae
|
added official web site link for Danish Sailing League 2014
|
2014-05-31 15:01:35 +02:00 |
|
|
Axel Uhl
|
ac71141fec
|
added Danish Sailing League to index.html
|
2014-05-31 15:01:29 +02:00 |
|
|
Axel Uhl
|
bda21b2464
|
added official web site link for Danish Sailing League 2014
|
2014-05-31 14:59:13 +02:00 |
|
|
Axel Uhl
|
a6b2e489e7
|
added Danish Sailing League to index.html
|
2014-05-31 14:54:34 +02:00 |
|
|
Axel Uhl
|
5d285b5ec9
|
Merge branch 'master' into tracapi
|
2014-05-31 14:42:08 +02:00 |
|
|
Axel Uhl
|
6171333290
|
added viewShowMapControls URL parameter to Spectator.html entry point
|
2014-05-31 14:29:21 +02:00 |
|
|
Axel Uhl
|
1d2e977ea7
|
offering the showMapControls URL parameter for RaceBoard.html, defaulting to true
|
2014-05-31 14:01:59 +02:00 |
|