 Simon Pamies
|
c0948fab65
|
Merged master
|
2015-02-05 12:05:16 +08:00 |
|
 Jan Broß
|
0e4775d51f
|
Add email field to Competitor
|
2015-02-04 22:36:48 +01:00 |
|
 Axel Uhl
|
d20450a172
|
updated launch configurations with new filestorage and AWS bundles
|
2015-02-04 05:12:51 +01:00 |
|
 Alexander Ries
|
14539148d1
|
changed db name in No Proxy, Jetty on 8889 launch conifg to replica
|
2015-02-03 22:09:39 +01:00 |
|
|
Axel Uhl
|
405001c948
|
consolidated imports
|
2015-02-02 16:38:45 +01:00 |
|
|
Axel Uhl
|
92c3a96ed0
|
removed redundant getActiveFileStorageService from RacingEventService
|
2015-02-02 16:38:07 +01:00 |
|
|
Axel Uhl
|
4972fdb93f
|
removed redundant version specifiers from com.sap.sailing.server manifest
|
2015-02-02 16:34:36 +01:00 |
|
 Fredrik Teschke
|
991aaf126b
|
Revert "introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8"
This reverts commit 02972d1bea.
Conflicts:
java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/ReplicableFileStorageManagementService.java
|
2015-01-29 17:00:02 +01:00 |
|
|
Fredrik Teschke
|
02972d1bea
|
introduce new filestorage.common bundle, so that filestorage bundle can be upgraded to java 1.8
|
2015-01-29 16:50:40 +01:00 |
|
|
Alexander Ries
|
ee9d6a9f7b
|
added com.sap.sailing.dashboards and mgwt bundle to launch configs
|
2015-01-29 13:41:30 +01:00 |
|
 Peter Siegmund
|
b86411c441
|
Merge branch 'master' into android_apps
|
2015-01-26 09:37:54 +01:00 |
|
|
Fredrik Teschke
|
9050a7d58e
|
lower start level of filestorage bundle to 3 due to test errors
|
2015-01-25 17:16:46 +01:00 |
|
|
Fredrik Teschke
|
fdb38874bd
|
avoid NPE when trying to find file storage mgmt service
|
2015-01-25 16:22:30 +01:00 |
|
 Nicolas
|
6402631c8f
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2015-01-24 16:33:26 +01:00 |
|
|
Axel Uhl
|
103dc8b56d
|
Merge branch 'master' into ribdashboard
|
2015-01-24 15:49:01 +01:00 |
|
|
Axel Uhl
|
39f19e0095
|
Merge branch 'master' into ribdashboard
Conflicts:
java/com.sap.sailing.feature/feature.xml
|
2015-01-24 14:41:42 +01:00 |
|
|
Fredrik Teschke
|
9a5fd4ac36
|
removing discrepancies to master (old 1.6 android compiler settings somehow appeared)
|
2015-01-23 20:09:53 +01:00 |
|
|
Fredrik Teschke
|
daad4c8c73
|
Merge branch 'master' into ftes-file-storage
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
|
2015-01-23 19:40:26 +01:00 |
|
|
Fredrik Teschke
|
7134f051a9
|
deleted filestorage.ui bundle, and added filestorage UI in c.s.s.gwt.ui
|
2015-01-23 19:33:39 +01:00 |
|
|
Fredrik Teschke
|
d7920ef0df
|
added com.sap.sse.osgi to launch configs
|
2015-01-23 19:32:07 +01:00 |
|
|
Axel Uhl
|
a3af0faae3
|
measure time it takes to compute wind based on maneuvers; re-enabled two more tests of this kind
|
2015-01-23 17:46:33 +01:00 |
|
|
Fredrik Teschke
|
3edbbb04bb
|
move type based service finder to sse bundles (create new com.sap.sse.osgi bundle)
|
2015-01-23 16:56:49 +01:00 |
|
|
Fredrik Teschke
|
3170d94fd4
|
added mimepull bundle to launch configs
|
2015-01-23 16:32:47 +01:00 |
|
|
Fredrik Teschke
|
11e1127699
|
add filestorage ui bundle
|
2015-01-23 16:31:37 +01:00 |
|
|
Nicolas
|
a6f0206f0d
|
Merge remote-tracking branch 'origin/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/DynamicTrackedRaceImpl.java
|
2015-01-23 16:12:17 +01:00 |
|
|
Fredrik Teschke
|
5fd5c67cd3
|
extended file storage service with properties and metadata
|
2015-01-23 13:57:00 +01:00 |
|
|
Fredrik Teschke
|
16f35c1b24
|
added implementation of file storage service
|
2015-01-23 11:15:28 +01:00 |
|
|
Fredrik Teschke
|
72a9d6890e
|
add logic to update team image, both in MongoDB and also replicated
|
2015-01-23 11:14:15 +01:00 |
|
|
Peter Siegmund
|
353e83f270
|
Merge branch 'master' into android_apps
|
2015-01-23 10:08:08 +01:00 |
|
|
Axel Uhl
|
9e58885c0d
|
added com.sap.sse.shared.android to feature and added it to all launch configurations
|
2015-01-22 15:34:36 +01:00 |
|
|
Alexander Ries
|
7dc1e72414
|
solved merge problems in LeaderboardEditing.gwt.xml, launch configs, feature.xml and TrackedRaceImpl.java
|
2015-01-22 13:15:23 +01:00 |
|
|
Axel Uhl
|
0c43f2b64b
|
moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common
|
2015-01-22 11:05:24 +01:00 |
|
|
Axel Uhl
|
9fb859a8b3
|
major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android
|
2015-01-22 10:57:00 +01:00 |
|
|
Nick Klose
|
31e9d0a5a3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2015-01-18 19:39:25 +01:00 |
|
|
Peter Siegmund
|
d72da977cb
|
Merge branch 'master' into android_apps
|
2015-01-15 15:34:10 +01:00 |
|
|
Axel Uhl
|
79fb30def8
|
added serialization.hsared.android bundle to launch configurations
|
2015-01-15 13:55:22 +01:00 |
|
|
Axel Uhl
|
6eeefa3443
|
added serialization.shared.android to com.sap.sailing.server's dependencies explicitly
|
2015-01-14 20:38:28 +01:00 |
|
|
Peter Siegmund
|
c580c10f89
|
Merge branch 'bug2572' into android_apps
|
2015-01-14 17:02:18 +01:00 |
|
|
Nicolas
|
2b16f75951
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2015-01-14 15:00:44 +01:00 |
|
|
Axel Uhl
|
7f7eb10256
|
move ObjectInputStreamResolvingAgainstCache to com.sap.sse and let com.sap.sse depend on com.sap.sse.common which has the IsManaagedByCache interface
|
2015-01-14 13:54:45 +01:00 |
|
|
Axel Uhl
|
24bba04589
|
moved ObjectInputStreamResolvingAgainstCache to com.sap.sse.common so that com.sap.sailing.domain does not require a dependency on com.sap.sse.replication anymore
|
2015-01-14 10:59:05 +01:00 |
|
|
Nicolas
|
cd748fa12b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.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/TracTracAdapter.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/RaceTrackingConnectivityParametersImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.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
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/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
|
2015-01-08 05:27:20 +01:00 |
|
|
Axel Uhl
|
3c4ea0287f
|
fixing boat class names for Selenium test cases
|
2015-01-05 14:56:11 +01:00 |
|
|
Axel Uhl
|
f52c7a470a
|
renamed WindStepping to WindSpeedStepping; use double[] instead of expensive Double[]
|
2015-01-02 17:20:06 +01:00 |
|
 Frederik Petersen
|
e3d3a1fcbd
|
Merge branch 'master' into polar-api
|
2015-01-02 13:18:20 +01:00 |
|
|
Frederik Petersen
|
5214a66a76
|
Removed old polar cache infrastructure and cleaned polardataservice
|
2015-01-02 13:16:33 +01:00 |
|
|
Fredrik Teschke
|
2118c8230f
|
Revert "remove unnecessary regatta param in WindStore methods"
This reverts commit ad65a5e54b.
|
2014-12-24 23:49:42 +01:00 |
|
|
Fredrik Teschke
|
ad8c1cd036
|
Merge branch 'regatta-log'
|
2014-12-24 19:25:12 +01:00 |
|
|
Fredrik Teschke
|
ad65a5e54b
|
remove unnecessary regatta param in WindStore methods
|
2014-12-24 14:46:55 +01:00 |
|
|
Fredrik Teschke
|
f3f7685305
|
remove regattalog in common method
|
2014-12-24 11:06:35 +01:00 |
|