 Axel Uhl
|
01f2edb2ae
|
avoid warnings in Selenium bundle; removed hard-coded file system path for Firefox executable for Selenium tests
|
2013-12-11 00:22:06 +01:00 |
|
|
Axel Uhl
|
1749cd54dd
|
removed expedition dependency from RacingEventService
|
2013-12-09 15:37:31 +01:00 |
|
 Lukas Niemeier
|
69016652a1
|
Merge branch 'master' into racecommittee_app
|
2013-12-05 16:25:51 +01:00 |
|
|
Lukas Niemeier
|
061936c97e
|
# renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
|
2013-12-04 16:18:33 +01:00 |
|
 Frederik Petersen
|
398940d766
|
Fixed response encoding of jax-rs web services
also fixed master data import URI encoding and compress option handling
|
2013-12-04 10:37:49 +01:00 |
|
|
Lukas Niemeier
|
492124fd16
|
# renamed proceduresconfiguration to RegattaConfiguration
|
2013-12-04 02:49:46 +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 |
|
|
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 |
|
|
Lukas Niemeier
|
30560c19bf
|
# racing procedure configuration attached to regatta
# some help text in UI
|
2013-11-25 16:46:05 +01:00 |
|
|
Lukas Niemeier
|
773670d608
|
# revamped the configuration system to support remote configuration of racing procedures
|
2013-11-25 00:01:25 +01:00 |
|
|
Frederik Petersen
|
0fbf6071de
|
Changed master data import to use gzip
|
2013-11-20 16:29:32 +01:00 |
|
|
Lukas Niemeier
|
953eaaa668
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
|
2013-11-20 12:25:57 +01:00 |
|
|
Lukas Niemeier
|
ad41f2e80c
|
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/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-11-20 11:37:40 +01:00 |
|
|
Frederik Petersen
|
a988003d15
|
Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
|
2013-11-20 09:02:55 +01:00 |
|
|
Lukas Niemeier
|
54fe07eb68
|
# simplified the creation of a RaceState
# added a temp method to set the start time via regattaoverview
|
2013-11-19 11:58:16 +01:00 |
|
|
Lukas Niemeier
|
f83e54e781
|
# split read and write part of state / racingprocedures
# EventRaceStatesJsonGetServlet uses (Readonly)RaceState now
|
2013-11-18 18:48:44 +01:00 |
|
|
Lukas Niemeier
|
58efde4c15
|
# default racing procedure and default course designer configurable for regtattas
|
2013-11-16 16:32:30 +01:00 |
|
|
Lukas Niemeier
|
ae6cc75b1c
|
# added configuration options for each racing procedures (DeviceConfiguration)
|
2013-11-16 11:49:47 +01:00 |
|
 Jens Rommel
|
df9445499b
|
- changed time stamp source from UTC (system time) to GPS Time
- replaced hard-wired column numbers by order given by header line
- fixed issue with Excel date conversion. Now settings miliseconds to zero.
|
2013-11-13 17:53:12 +01:00 |
|
|
Axel Uhl
|
2b6462939a
|
added .header("Access-Control-Allow-Origin", "*") again to LeaderboardGroupsResource to allow cross-server access
|
2013-11-13 10:42:49 +01:00 |
|
|
Lukas Niemeier
|
ea69b28ad2
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/CollectionNames.java
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/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.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/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.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
|
2013-11-11 03:00:31 +01:00 |
|
|
Lukas Niemeier
|
422d24eaa5
|
Merge branch 'otracelog' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
|
2013-11-04 01:48:14 +01:00 |
|
|
Lukas Niemeier
|
bb58d78236
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
|
2013-10-30 14:38:14 +01:00 |
|
|
Lukas Niemeier
|
a9bce35b6f
|
Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app
|
2013-10-29 22:48:18 +01:00 |
|
|
Axel Uhl
|
3da17302f8
|
removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory
|
2013-10-28 17:26:26 +01:00 |
|
|
Axel Uhl
|
d86ef87132
|
fixed server tests where the refactoring of TracTrac API calls hadn't correctly passed the TrackerManager along
|
2013-10-24 18:26:07 +02:00 |
|
|
Axel Uhl
|
e053f76f8b
|
first compilable version after moving TracTrac specifics away from server bundle
|
2013-10-24 15:37:08 +02:00 |
|
|
Lukas Niemeier
|
313085c456
|
# added server code to create, edit and delete device configurations
|
2013-10-23 16:02:09 +02:00 |
|
|
Axel Uhl
|
e7c01bbb00
|
made compile by adjusting competitor serialization to modified serializers
|
2013-10-23 10:08:14 +02:00 |
|
 Fredrik Teschke
|
f7a3f5c8df
|
added competitor persistence; a first attempt to cherry-pick and merge this feature from the cmd-android-tracking branch
Conflicts:
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatJsonDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BoatJsonSerializer.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/tracking/impl/CreateCompetitorPostServlet.java
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
|
2013-10-23 10:01:12 +02:00 |
|
|
Lukas Niemeier
|
8a34842d14
|
# renamed TabletConfiguration to DeviceConfiguration
|
2013-10-16 16:04:17 +02:00 |
|
|
Jens Rommel
|
48a1a6c187
|
Added seletion-aware wind import
|
2013-10-15 11:25:40 +02:00 |
|
|
Jens Rommel
|
229823303b
|
Added trimming to boat id handling.
|
2013-10-14 09:59:52 +02:00 |
|
|
Jens Rommel
|
7f111e2392
|
Working expedition wind import.
Still missing:
- import for selected subset of races
- UI beautification
|
2013-10-11 17:05:25 +02:00 |
|
|
Jens Rommel
|
612700d7f3
|
Initial working UI, includes parsing and sending boat id .
Still missing:
- apply to selected races only
|
2013-10-10 12:11:52 +02:00 |
|
|
Jens Rommel
|
6c35fa9122
|
Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
Conflicts:
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
|
2013-10-09 12:16:31 +02:00 |
|
|
Frederik Petersen
|
2b7ac5ba00
|
Removed old non used master data service
|
2013-10-08 15:30:37 +02:00 |
|
|
Frederik Petersen
|
15dce59737
|
MasterDataImport now uses JAX-RS services
|
2013-10-08 15:26:48 +02:00 |
|
|
Frederik Petersen
|
1e427a038a
|
Created MasterDataResource for jax-rs style rest service
|
2013-10-08 13:56:16 +02:00 |
|
|
Jens Rommel
|
907f9fdc08
|
Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
|
2013-10-07 12:36:06 +02:00 |
|
|
Lukas Niemeier
|
d4adb21515
|
# preparing the server for handling configuration requests of RC tablets
|
2013-10-02 14:33:29 +02:00 |
|
|
Jens Rommel
|
68fc6fac76
|
Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
|
2013-09-23 16:17:12 +02:00 |
|
|
Axel Uhl
|
822aff3194
|
started work on bug 655 by adding TimePoint argument to isScoreCorrected API
|
2013-09-23 16:11:44 +02:00 |
|
|
Axel Uhl
|
e47ca0ac3b
|
don't use access-based ordering of LinkedHashMaps that may be used concurrently; fixing bug 1529
|
2013-09-20 15:08:17 +02:00 |
|
|
Jens Rommel
|
44a2a52a3e
|
Merge remote-tracking branch 'refs/remotes/external/master' into jens--expedition-wind-import
|
2013-09-18 09:02:00 +02:00 |
|
|
Jens Rommel
|
56e398a943
|
Adding races affected by wind import to servlet response.
|
2013-09-18 09:01:32 +02:00 |
|
|
Axel Uhl
|
abdae7e871
|
tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
|
2013-09-17 17:57:38 +02:00 |
|
 fmittag
|
53f9727809
|
added missing optional parameters description for some of the new Webservices implemented with JAX-RS
|
2013-09-16 16:06:35 +02:00 |
|
|
Jens Rommel
|
3ed17d3766
|
- Made recordWind return a flag wether a wind fix has been considered for a tracked race
- Made Expedition importer tolerant for partially filled rows, collecting partial data until a fix is complete
|
2013-09-13 09:41:23 +02:00 |
|