 Frederik Petersen
|
85f11b32df
|
Merge branch 'master' into polar-api
|
2014-03-06 10:47:26 +01:00 |
|
 fmittag
|
cb9a436476
|
made EventJsonSerializer null-safe for startDate and endDate
|
2014-02-27 15:50:15 +01:00 |
|
|
Frederik Petersen
|
483a9deb80
|
Merge branch 'master' into polar-api
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.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.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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/pom.xml
|
2014-02-26 12:31:44 +01:00 |
|
|
fmittag
|
b5bff27a10
|
Added startDate and endDate as new properties of the 'Event' domain class (including edit UI)
|
2014-02-24 16:04:33 +01:00 |
|
 Axel Uhl
|
c69e31a994
|
encorporate hasSplitFleetContiguousScoring in RESTlet output
|
2014-02-12 00:41:00 +01:00 |
|
|
Frederik Petersen
|
89385d802f
|
Moved TopLevelMasterData to domain package
removed unused master data json facilities
|
2014-02-09 16:08:59 +01:00 |
|
|
Frederik Petersen
|
12c6451c8b
|
Started changing master data export to use java binary object serializ.
|
2014-02-07 16:31:52 +01:00 |
|
|
Axel Uhl
|
28fa8c528b
|
fixed a bunch of NPE issues in the RCapp
|
2014-01-27 10:26:59 +01:00 |
|
|
Frederik Petersen
|
ed6d224a1c
|
Carried points, score corrections, suppressed competitors
are all imported even if no corresponding race is loaded on
the exporting side.
also fixed competitor id serialization
|
2014-01-23 16:10:00 +01:00 |
|
|
Frederik Petersen
|
c008cd923a
|
Added failing test for carried points persistance
|
2014-01-22 15:11:52 +01:00 |
|
|
Axel Uhl
|
049431e629
|
fixed indentation
|
2014-01-22 08:06:14 +01:00 |
|
 Nick Klose
|
a172d69861
|
Edits after review for merge with master.
|
2014-01-17 11:36:28 +01:00 |
|
|
Nick Klose
|
0893ef858d
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
|
2014-01-16 16:06:28 +01:00 |
|
|
Frederik Petersen
|
926fc013dc
|
Started working on distributed polar data service
|
2014-01-15 13:24:46 +01:00 |
|
|
Frederik Petersen
|
ab9ba0459d
|
RaceId in master data windtrack serialization is now serialized depending
on its type
|
2014-01-08 10:07:01 +01:00 |
|
|
Nick Klose
|
aaad94801c
|
Merge branch 'master' into mark-rounding-inference
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
|
2013-12-16 10:45:28 +01:00 |
|
|
Axel Uhl
|
4bc9ea0d84
|
fixed bug 1656 (NPE during master data import due to a null color)
|
2013-12-13 20:50:28 +01:00 |
|
|
Axel Uhl
|
4ad6594a25
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
|
2013-12-10 09:30:41 +01:00 |
|
|
Axel Uhl
|
a35c1bbc95
|
fixed competitor color serialization after switching from String to Color
|
2013-12-10 09:28:31 +01:00 |
|
|
Axel Uhl
|
bca2a9b982
|
fixed serialization/deserialization for null colors
|
2013-12-09 23:08:02 +01:00 |
|
|
Axel Uhl
|
1404c18f67
|
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
|
2013-12-09 22:06:29 +01:00 |
|
|
Axel Uhl
|
e952f42176
|
removed redundant getDynamicCompetitor method
|
2013-12-09 20:49:22 +01:00 |
|
|
Nick Klose
|
3018bd8bfe
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
|
2013-12-09 18:35:16 +01:00 |
|
|
Nick Klose
|
96075f5cc1
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
|
2013-12-09 13:22:09 +01:00 |
|
|
fmittag
|
6d543b46b4
|
renamed new attribute displayColor of competitor back to color
|
2013-12-07 16:25:54 +01:00 |
|
|
fmittag
|
46ddac833a
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-07 16:13:18 +01:00 |
|
|
Axel Uhl
|
051ce73597
|
factored production of competitor ID so it can be re-used in serializer and MongoObjectFactory
|
2013-12-07 15:18:51 +01:00 |
|
|
fmittag
|
5918bb1d14
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-07 14:22:27 +01:00 |
|
|
fmittag
|
62b3a9c6ae
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-12-06 19:19:09 +01:00 |
|
|
fmittag
|
d037441787
|
added load/store/editing of the new attribute displayColor for a competitor
|
2013-12-06 18:40:15 +01:00 |
|
|
Axel Uhl
|
d4e6ab3624
|
added unique index for competitor by ID; use UUID for course area all about
|
2013-12-06 18:30:21 +01:00 |
|
 Lukas Niemeier
|
061936c97e
|
# renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
|
2013-12-04 16:18:33 +01:00 |
|
|
Nick Klose
|
e511cd7f2f
|
Merge branch 'master' into marks
Conflicts:
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
|
2013-12-04 10:18:59 +01:00 |
|
|
Lukas Niemeier
|
492124fd16
|
# renamed proceduresconfiguration to RegattaConfiguration
|
2013-12-04 02:49:46 +01:00 |
|
|
Lukas Niemeier
|
d4601894dc
|
# use pass-trough interface instead of getCompetitorStore chain
|
2013-12-03 18:38:36 +01:00 |
|
|
Lukas Niemeier
|
5b238f500a
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/CompetitorMasterDataDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/LeaderboardGroupMasterDataJsonDeserializer.java
|
2013-12-03 18:34:33 +01:00 |
|
|
Lukas Niemeier
|
69ff32e1d8
|
# extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
|
2013-12-02 18:33:08 +01:00 |
|
|
Frederik Petersen
|
dd39c1615a
|
Workaround fix for id serialization in master data import
needs more thorough fix when bug 1599 is "fixed"
|
2013-12-02 16:37:11 +01:00 |
|
|
Lukas Niemeier
|
fecbbe171c
|
# cleanup
|
2013-11-30 14:22:33 +01:00 |
|
|
Lukas Niemeier
|
04e8671a11
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-11-29 18:24:13 +01:00 |
|
|
Lukas Niemeier
|
453ac2b142
|
Merge branch 'master' into racecommittee_app
Conflicts:
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.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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-11-29 16:42:07 +01:00 |
|
|
Nick Klose
|
64ad880d2e
|
Merge branch 'master' into mark-rounding-inference
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
|
2013-11-28 10:15:29 +01:00 |
|
|
Frederik Petersen
|
28a36d53ec
|
Fixed race log event serialization for master data import
|
2013-11-27 12:21:43 +01:00 |
|
|
Frederik Petersen
|
9b14785966
|
Fixed wind serialization for race data import
|
2013-11-26 16:03:54 +01:00 |
|
|
Lukas Niemeier
|
30560c19bf
|
# racing procedure configuration attached to regatta
# some help text in UI
|
2013-11-25 16:46:05 +01:00 |
|
|
Lukas Niemeier
|
2b1a1d17d8
|
# added new RacingProcedure BASIC
|
2013-11-25 02:34:46 +01:00 |
|
|
Lukas Niemeier
|
7c03c925f9
|
# RacingProcedures are configured by passed configuration
|
2013-11-25 01:32:58 +01:00 |
|
|
Lukas Niemeier
|
773670d608
|
# revamped the configuration system to support remote configuration of racing procedures
|
2013-11-25 00:01:25 +01:00 |
|
|
Lukas Niemeier
|
e0f2309b16
|
# working towards implementing the RacingProcedureConfiguration
|
2013-11-22 01:27:26 +01:00 |
|
|
Lukas Niemeier
|
7d63298739
|
merge fix
|
2013-11-20 19:20:43 +01:00 |
|