 Steffen Schäfer
|
9c2ff665a7
|
Merge branch 'master' into permission-vertical
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.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.gateway/webservices/api/v1/index.html
java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
java/com.sap.sse.security/META-INF/MANIFEST.MF
|
2018-10-23 13:10:46 +02:00 |
|
 Kai Börnert
|
c08e8b4369
|
bug4768 added multiple parts that will explicitly set permissions,
created an interface to allow most ownable objects to directly return
the QualifiedObjectIdentifier
|
2018-10-10 13:16:16 +02:00 |
|
 D067890
|
7708222141
|
bug4104: First approach of implementing image service
|
2018-09-25 16:05:56 +02:00 |
|
|
D067890
|
3780459f64
|
bug4104: Private tags are nor stored in the user storage
|
2018-08-27 18:37:20 +02:00 |
|
|
D067890
|
c79f6d2cee
|
bug4104: While creating tag or button you can set isVisibleForPublic
|
2018-08-16 13:38:16 +02:00 |
|
|
D067890
|
208f5663ed
|
bug4104: Tags contain boolean isPublic field
|
2018-08-16 11:47:57 +02:00 |
|
 Henri Kohlberg
|
68fe2ca6d1
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
# 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.properties
|
2018-08-06 10:48:19 +02:00 |
|
 Vladislav Chumak
|
e8c43db114
|
Changed polars based features for maneuver estimation data
|
2018-07-26 16:25:01 +02:00 |
|
|
Henri Kohlberg
|
028caf907a
|
Bug 4104: Removed username from RaceLogTagEvent as this information is laready saved in author object.
|
2018-07-19 17:02:32 +02:00 |
|
|
D067890
|
6cbfbd42e9
|
bug4104: fixed minor error
|
2018-07-19 08:50:33 +02:00 |
|
|
D067890
|
1a6d626479
|
bug4104: Add test for de-/serialization of RaceLogTagEvents
|
2018-07-18 16:35:59 +02:00 |
|
|
D067890
|
cadabc0a82
|
Merge branch 'master' into bug4104
# Conflicts:
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2018-07-18 16:16:58 +02:00 |
|
|
D067890
|
487d2f2577
|
bug4104: added unit test for RaceLogTagEventSerializer
|
2018-07-13 11:07:56 +02:00 |
|
|
D067890
|
8e4ee0151f
|
bug4668: minor fix in test
|
2018-07-12 10:24:07 +02:00 |
|
|
D067890
|
bbf8f13b36
|
bug4668: Removed unused imports
|
2018-07-12 09:37:17 +02:00 |
|
|
D067890
|
d945f551e3
|
bug 4668: minor fix of test
|
2018-07-12 09:34:25 +02:00 |
|
|
D067890
|
008a5b4cff
|
bug4668: Added tests for deserialization of RaceLogEvents
|
2018-07-12 09:19:41 +02:00 |
|
|
D067890
|
0ede320c21
|
Added RaceLogEvent for tagging, added fitting visit methods
|
2018-07-09 16:21:25 +02:00 |
|
|
Vladislav Chumak
|
53abb3e730
|
Added export for gps fixes with estimation data
|
2018-07-09 09:16:03 +02:00 |
|
|
Vladislav Chumak
|
2774989686
|
Added polar feature to exported estimation data + corrected polars bugs
|
2018-07-09 09:16:03 +02:00 |
|
|
Vladislav Chumak
|
e94ca51c15
|
Added export for gps fixes with estimation data
|
2018-07-05 12:37:32 +02:00 |
|
|
Vladislav Chumak
|
316ccc3b43
|
Added polar feature to exported estimation data + corrected polars bugs
|
2018-07-05 10:52:05 +02:00 |
|
 Maximilian Groß
|
37917a50a4
|
Merge branch 'master' into bug4491
# Conflicts:
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.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/client/StringMessages_fr.properties
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
# java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
|
2018-05-28 08:35:21 +02:00 |
|
|
Vladislav Chumak
|
feb85df6f9
|
Added measurements for GPS-holes within maneuver estimation data
|
2018-05-04 19:41:33 +02:00 |
|
|
Maximilian Groß
|
97be670c2b
|
fixed imports
|
2018-04-20 13:25:17 +02:00 |
|
|
Maximilian Groß
|
e977678869
|
Merge branch 'master' into bug4491
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.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_es.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.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/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
|
2018-04-20 13:10:37 +02:00 |
|
|
Vladislav Chumak
|
9db575b1a5
|
Added position to CompleteManeuverCurveWithEstimationData
|
2018-04-17 14:35:22 +02:00 |
|
|
Vladislav Chumak
|
7f3115cfc9
|
Merge remote-tracking branch 'origin/maneuver_refactoring'
|
2018-04-15 14:31:18 +02:00 |
|
|
Vladislav Chumak
|
8f86d0a862
|
Added deserialization for DetailedBoatClassJsonSerializer, fixed test
|
2018-04-13 19:02:34 +02:00 |
|
|
Vladislav Chumak
|
f702fea3d0
|
Implemented serialization/deserialization test for estimation data
|
2018-04-13 18:08:09 +02:00 |
|
 Axel Uhl
|
22b4ec6535
|
Merge branch 'master' into bug4509
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
|
2018-04-13 15:55:28 +02:00 |
|
|
Axel Uhl
|
b4f1c8fb10
|
more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
|
2018-04-13 09:01:27 +02:00 |
|
|
Axel Uhl
|
662fd99fad
|
Merge branch 'master' into bug4509
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
|
2018-04-12 14:23:56 +02:00 |
|
|
Axel Uhl
|
4c319f5f6c
|
renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
|
2018-04-12 14:18:16 +02:00 |
|
|
Maximilian Groß
|
ed1fae0c8f
|
divided datamining from sailing specific classes
|
2018-04-12 07:40:59 +02:00 |
|
|
Axel Uhl
|
1cf923a027
|
use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
|
2018-04-11 17:26:20 +02:00 |
|
|
Axel Uhl
|
e4e9cdb22c
|
changed CompetitorAndBoat[De]Serializer such that it is backward compatible for CompetitorWithBoat
Change-Id: Ia5717bdef5d9db7833b8d44df061dce524cecf85
|
2018-04-09 18:23:33 +02:00 |
|
|
Axel Uhl
|
06447318e5
|
bug4500: consolidated the two Competitor Json (De-)Serializers into one
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
|
2018-04-09 16:39:17 +02:00 |
|
|
Axel Uhl
|
827824f699
|
re-added "boat" field to competitor serialization for backward compatibility
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
|
2018-04-06 17:31:05 +02:00 |
|
|
Axel Uhl
|
360f72a6a7
|
Merge branch 'master' into bug2822_boatcolors
|
2018-03-24 08:49:11 +01:00 |
|
|
Axel Uhl
|
bd90f921dd
|
added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule
|
2018-03-24 01:45:37 +01:00 |
|
|
Axel Uhl
|
5c049c4564
|
fixed test case which requires different competitor IDs for competitors of different types now# Please enter the commit message for your changes. Lines starting
Change-Id: I7c0867a321ea2a8a4c9d79b6e78665c52dbbdf46
|
2018-03-20 23:29:38 +01:00 |
|
 Frank Mittag
|
162392a435
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2018-02-27 15:17:45 +01:00 |
|
|
Kai Boernert
|
f505b10d50
|
removed RaceLogCourseAreaChangedEvent
|
2018-02-23 17:06:14 +01:00 |
|
|
Frank Mittag
|
62438c83d6
|
Merged RaceLogRegisterCompetitorEvent and RaceLogRegisterCompetitorAndBoatEvent into just RaceLogRegisterCompetitorEvent to make it easier to handle regattas with changing boats and non changing boats
|
2017-12-07 16:31:06 +01:00 |
|
|
Frank Mittag
|
d45de24610
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
# 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/DomainObjectFactoryImpl.java
# java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.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/impl/PersistentCompetitorStore.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2017-11-22 15:39:00 +01:00 |
|
|
Axel Uhl
|
6924ea32b8
|
bug 4356: included MergeState enum and field in CompetitorResult
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
|
2017-10-27 10:42:32 +02:00 |
|
|
Frank Mittag
|
48162c73be
|
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
|
2017-08-25 17:09:00 +02:00 |
|
|
Frank Mittag
|
c295bce93c
|
added a couple of racelog events for competitor/boats assignments (not sure we will need all of them)
|
2017-07-12 17:05:17 +02:00 |
|
|
Steffen Schäfer
|
1542a36109
|
Merge branch 'master' into bug2822_boatcolors
|
2017-05-16 16:12:16 +02:00 |
|