Commit Graph
16163 Commits
Author SHA1 Message Date
Nicolas 162094b6aa Fixed WhiteBox tests. 2014-05-14 17:19:00 +02:00
Nicolas 6ac6a598fd Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-05-14 16:29:55 +02:00
Axel Uhl 958d7b15e2 fixing bug 1935 by initializing the RaceLogInformation after deserializing RegattaImpl and FlexibleLeaderboardImpl objects; 2014-05-14 14:26:57 +02:00
Axel Uhl 2ea2457409 added net.sf.marineapi to Jetty on 8889 launch config with Proxy 2014-05-14 13:11:59 +02:00
Simon Pamies 3928e2f9ce Changed spacing for amazon default config and changed server name to specific event 2014-05-14 12:41:19 +02:00
Axel Uhl 18d6856a67 Merge remote-tracking branch 'origin/master' 2014-05-14 11:12:04 +02:00
Simon Pamies 3c9b493687 Added information about how to translate new properties 2014-05-14 11:01:18 +02:00
Axel Uhl 858b2b55fe Merge remote-tracking branch 'origin/master'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2014-05-14 10:53:17 +02:00
Christopher Ronnewinkel (D036654) 5db2c1824f Merge branch 'ExternalGit/master' 2014-05-14 10:28:06 +02:00
Christopher Ronnewinkel (D036654) f75031deb7 Revert "fix gwt compile issue due to missing parameter in competitorRegistrationsMissingProceed;"
This reverts commit a282cfa1b0.
2014-05-14 10:14:26 +02:00
Nicolas 789c3de7c9 Merge branch 'master' into mark-rounding-inference 2014-05-13 23:53:51 +02:00
Nicolas c960081579 Reduced the number of races tested for markpassings to reduce build time. 2014-05-13 23:51:47 +02:00
Nicolas 9a6e9484a4 Implemented addition and removal of waypoints and created simple test. 2014-05-13 23:42:41 +02:00
Christopher Ronnewinkel (D036654) a282cfa1b0 fix gwt compile issue due to missing parameter in competitorRegistrationsMissingProceed; 2014-05-13 20:31:28 +02:00
Simon Pamies 390b0b5bce Making sure that the amazon launch config is put at the right place 2014-05-13 17:27:57 +02:00
Christopher Ronnewinkel (D036654) 4bd03b278c Merge branch 'origin/simulator_maps_v3' 2014-05-13 17:16:04 +02:00
Christopher Ronnewinkel (D036654) f3f60c4ef6 Merge branch 'origin/master' 2014-05-13 17:13:18 +02:00
Christopher Ronnewinkel (D036654) ea7d8ff0d5 replace PositionDTO with Position; 2014-05-13 17:07:53 +02:00
fmittag 05b4d30e3a Merge remote-tracking branch 'origin/master' 2014-05-13 16:52:28 +02:00
fmittag 2cd1a088df added highpoint scoring system where the winner gets 5 points 2014-05-13 16:52:03 +02:00
Simon Pamies 45bf069f25 Make sure that we have at least the english translation 2014-05-13 16:45:11 +02:00
Nicolas 98334fdcc6 Fixed merge issues. 2014-05-13 16:28:35 +02:00
Nicolas 70551ec1ed Merge branch 'master' into mark-rounding-inference 2014-05-13 16:16:25 +02:00
Nicolas 390f23dddf Finished caches, some problems merging. 2014-05-13 16:09:07 +02:00
Nicolas 69f3c5c460 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2014-05-13 15:53:28 +02:00
Simon Pamies e8578a3523 Fixed translatable string for leaderboard 2014-05-13 15:44:14 +02:00
Simon Pamies c479814e57 Added russian language to additional resources 2014-05-13 15:18:52 +02:00
Christopher Ronnewinkel (D036654) aab7cba023 more cleanup; use PositionDTO for LatLngs; 2014-05-13 15:02:47 +02:00
Axel Uhl cc37019222 Merge remote-tracking branch 'server/master' 2014-05-13 14:38:12 +02:00
Axel Uhl 78b65ae114 the randomized wait interval in the SwissTiming connector killed a bunch of tests assuming faster response; withdrew the random wait;
This was a workaround for bug 171 (see comment #2). We need to wait for what I expect to be a fix coming from SwissTiming.
2014-05-13 14:38:05 +02:00
Alexander Ries 5e20291de9 Updated onboarding (markdown) 2014-05-13 11:35:39 +00:00
Alexander Ries f4addb7847 Updated onboarding (markdown) 2014-05-13 11:34:12 +00:00
Alexander Ries 21cc0297e5 Updated onboarding (markdown) 2014-05-13 11:33:35 +00:00
Alexander Ries d47d0178f4 Updated onboarding (markdown) 2014-05-13 11:31:10 +00:00
Simon Pamies b845fab6cc Added simple launch template for amazon servers 2014-05-13 11:44:02 +02:00
fmittag 818f5cade7 missed a message in russian properties 2014-05-13 11:23:17 +02:00
fmittag f8fe6fb326 added missing properties to russian properties file 2014-05-13 11:16:13 +02:00
Simon Pamies e4f95522a4 Merge branch 'russian-lang-setup' 2014-05-13 09:52:38 +02:00
Simon Pamies 8f07d0f864 Changed log level of some messages related to RaceLog add operation to fine 2014-05-13 09:52:13 +02:00
Simon Pamies 780d1ec12c Somehow marineapi has been missing from the dependencies 2014-05-13 09:14:12 +02:00
Simon Pamies 4361c951e6 Added russian to the list of available languages 2014-05-13 09:13:31 +02:00
Simon Pamies c1f439707f Added translation to russian 2014-05-13 09:06:01 +02:00
Axel Uhl 88215764a5 use SwissTiming race UUID as RaceDefinition ID 2014-05-13 01:26:15 +02:00
Axel Uhl b4c2202fd4 see bug 171, comment #2; introducing a random delay as a workaround for mass-loading of SwissTiming races 2014-05-13 00:06:58 +02:00
Axel Uhl e39836cdb3 working on old bug 171; when one connection in a whole series fails, subsequent connections were affected; resolved these dependencies 2014-05-12 23:45:33 +02:00
Axel Uhl b1ff618eef fixed more NPEs in context of bug 1947 2014-05-12 22:00:14 +02:00
Axel Uhl ebbd963847 trying to fix bug 1947 (NPE with RaceLogTrackingState when there is no RaceLog attached to a column) 2014-05-12 21:28:47 +02:00
fmittag 70868ef291 Merge remote-tracking branch 'origin/master' 2014-05-12 18:31:13 +02:00
fmittag ad8cabe584 added 'penaltyCircles' to gateway service for competitor leg information 2014-05-12 18:30:24 +02:00
Axel Uhl b531218338 In racelog tracking wiki, described how to obtain the GPSFixStore into which to deliver the GPS fixes when creating an adapter 2014-05-11 22:11:59 +00:00