Axel Uhl
|
cae1248a74
|
Merge branch 'master' into permission-vertical
Change-Id: I99b41d6951df0f2f63fc1a0335122f3e605ae0b2
|
2018-11-30 09:53:37 +01:00 |
|
Axel Uhl
|
ccfcba5c25
|
fixed comments on SensorFixStoreremoved obsolete commented code
Change-Id: Ibfb6d8d00fdb80f2db4626daf5158dada1c9f2e0
|
2018-11-29 02:00:43 +01:00 |
|
Thomas Wiese
|
cc2c751223
|
Merge branch 'bug4709' into bug4709_pv
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SlicingTest.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CreateRegattaCallback.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/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2018-10-24 15:20:27 +02:00 |
|
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 |
|
Henri Kohlberg
|
622a410dc5
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
|
2018-10-18 15:07:52 +02:00 |
|
Thomas Wiese
|
de5c9c12af
|
centralize validation of competitor registration type
|
2018-10-16 10:35:02 +02:00 |
|
Thomas Wiese
|
be1f1fd6c5
|
minor fixes from code review
|
2018-10-16 09:02:29 +02:00 |
|
Steffen Schäfer
|
c2cdfe9dbb
|
Merge branch 'master' into permission-vertical
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/LabeledAbstractFilterablePanel.java
|
2018-10-15 16:35:41 +02:00 |
|
Axel Uhl
|
9e98827f8d
|
fixed more numeric object creations from number representations in Mongo
Change-Id: I294d3b3652c060d8611b1b22c748a4a829d81f70
|
2018-10-15 16:08:27 +02:00 |
|
Steffen Schäfer
|
96cdbcc9c5
|
Merge branch 'master' into bug4709
|
2018-10-15 14:27:27 +02:00 |
|
Thomas Wiese
|
ca0633dbc7
|
add secret for registration link to regatta dialog in the admin console
|
2018-10-15 14:23:32 +02:00 |
|
Steffen Schäfer
|
c8d86da7a4
|
Merge branch 'master' into permission-vertical
|
2018-10-15 10:29:24 +02:00 |
|
Axel Uhl
|
1f56437873
|
assume only Number, not Integer or Double; types don't survive backup/restore as of now
Change-Id: I1e07dfca2859e76e99e2380d4dbe0eee6379aa73
|
2018-10-12 16:29:34 +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 |
|
Axel Uhl
|
c7564f5014
|
coding conventions such as single point of exit, some formatting, making some fields and methods private where possible
Change-Id: Ie5c054ecf5bac44aafc2c6ec8c5d66d9eca9bfda
|
2018-10-08 14:17:47 +02:00 |
|
Thomas Wiese
|
b254806a10
|
Revert "Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base"
This reverts commit b1bb9af5b6.
|
2018-10-04 14:01:38 +02:00 |
|
Thomas Wiese
|
b1bb9af5b6
|
Move CompetitorRegistrationType from com.sap.sailing.domain.common to com.sap.sailing.domain.base
|
2018-10-04 10:03:59 +02:00 |
|
Kai Börnert
|
0391bd639c
|
bug4766 changed maneuver notification to allow multiple race maneuver
change notifications, if multiple deviceids mappings exist at a point of
time.
|
2018-09-28 09:30:56 +02:00 |
|
Kai Börnert
|
7f08608da8
|
bug4766 initial approach
|
2018-09-27 18:02:35 +02:00 |
|
D067890
|
7708222141
|
bug4104: First approach of implementing image service
|
2018-09-25 16:05:56 +02:00 |
|
Thomas Wiese
|
22d06882c3
|
rename regatta attribute canCompetitorRegisterToOpenRegatta to competitorRegistrationType and swicht over to enum datatype
|
2018-09-21 17:41:57 +02:00 |
|
Thomas Wiese
|
d992a3e9a0
|
Add parameter for user regsitration to regatta
|
2018-09-18 16:09:41 +02:00 |
|
D067890
|
3780459f64
|
bug4104: Private tags are nor stored in the user storage
|
2018-08-27 18:37:20 +02:00 |
|
Henri Kohlberg
|
cf874f7929
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
|
2018-08-20 11:18:26 +02:00 |
|
Henri Kohlberg
|
d38c823eda
|
Bug 4104: Major code refactoring, part 1
|
2018-08-17 15:55:57 +02:00 |
|
D067890
|
208f5663ed
|
bug4104: Tags contain boolean isPublic field
|
2018-08-16 11:47:57 +02:00 |
|
Axel Uhl
|
784a47e77c
|
removed extra empty lines
Change-Id: Id0f148452c6b45a4abe1964185b6d84f2aab9df2
|
2018-08-15 10:33:10 +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 |
|
Henri Kohlberg
|
c42d2bb40b
|
Bug 4104: Tags will show up in right side panel if they were tagged before the current position of time slider (already displayed tags won't be hidden when scrolling back in time), extracted TagDTO to an own class, tags will be stored like other race log events (structure in database)
|
2018-07-19 08:30:43 +02:00 |
|
D067890
|
13107bba7b
|
bug4104: RaceLogTagEvents now contain a user name
|
2018-07-13 10:53:36 +02:00 |
|
D067890
|
902be52661
|
bug4104: changed type of imageURL to String
|
2018-07-12 15:43:47 +02:00 |
|
D067890
|
9d317ff0b8
|
bug 4104: DocumentObjectFactory should be able to loadRaceLogTagEvents
|
2018-07-10 15:10:39 +02:00 |
|
D067890
|
5fcfa6a135
|
return result instead of null
|
2018-07-10 10:49:15 +02:00 |
|
D067890
|
0ede320c21
|
Added RaceLogEvent for tagging, added fitting visit methods
|
2018-07-09 16:21:25 +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 |
|
Axel Uhl
|
e956d91484
|
bug 4574: fixing multiple registration of leaderboard cache invalidators; added boat chance-dependent leaderboard invalidation; fixed boat update routine
Change-Id: I88a351768ec5bf3cdd3f63dafed0e3ec1004d80e
|
2018-05-14 18:33:18 +02:00 |
|
Axel Uhl
|
9ed9a42cbf
|
implemented DB migration for old, deprecated representation of two-mark control points
Change-Id: I14adcd5af2a1ab3d22bc137e10159c96f960d1e9
|
2018-05-08 18:04:29 +02:00 |
|
Axel Uhl
|
20d24a7bec
|
bug4558: create the 2nd league auxiliary boat for bug2822 migration if it doesn't exist yet
Change-Id: If121be7b80a68ba738fcfdc88a2f3bbd45757e3f
|
2018-05-06 02:17:03 +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 |
|
Axel Uhl
|
c0532280f2
|
bug4520: added migration code for 2. Bundesliga 2017 corner case
Change-Id: I13140109232efe9e0bf1c4794aac7f00adc065e9
|
2018-04-19 22:45:10 +02:00 |
|
Axel Uhl
|
aa8d6ea8a2
|
removed redundant null check
Change-Id: Ifd325b8fc86c0de969c2d03812c633af9add1b86
|
2018-04-19 20:50:28 +02:00 |
|
Axel Uhl
|
18c777a99f
|
adjusted SwissTiming connector to accomodate UUIDs for mark devices and competitors
Change-Id: Ieaca20de4eacbbc5c64e218fb557045f2590e6f6
|
2018-04-19 17:24:54 +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 |
|
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
|
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
|
20549542ae
|
made mongoObjectFactory field transient in MigratableRegattaImpl to
ensure serializability
Change-Id: Idfe4d179c80feed3581493231394fc76cfe608e5
|
2018-03-21 11:30:34 +01:00 |
|
Axel Uhl
|
ffb485eef6
|
fixed RACE_LOGS updating problem
Change-Id: I5e41a1a90aa5559b779c1d0e60ad17a906fbe686
|
2018-03-21 01:23:15 +01:00 |
|