Steffen Schaefer
73b377a6cd
Merge branch 'master' into permission-vertical
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2019-01-24 09:41:58 +01:00
Axel Uhl
589df34a03
Merge branch 'master' into bug4018
...
Change-Id: I4508d0187921733eceea5fa12e04147476eb09b6
2019-01-22 21:03:22 +01:00
Kai Börnert
4b34b58102
Merge branch 'master' into bug4412
2019-01-22 17:45:55 +01:00
Axel Uhl
d2c3bdf2b5
ensure in-order delivery of messages from replica to master;
...
always pass operations to be sent to master into the queue so they
cannot be delivered to the master earlier than other queued operations
after connectivity has been restored
Change-Id: I7b1409dc4663659039058ce2c0511a26009114b4
2019-01-22 14:31:58 +01:00
Kai Börnert
57bdcc1bcc
Merge branch 'master' into permission-vertical
...
Conflicts:
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
java/com.sap.sse/src/com/sap/sse/util/HttpUrlConnectionHelper.java
2019-01-22 12:21:19 +01:00
Alessandro Stoltenberg
20fb09dad2
Added minimum half boundary width to ValueRangeFlexibleBoundaries. Windstreamlets have 0.35 knots minimum half boundary width.
2019-01-21 11:23:28 +01:00
Manuel Zedel
a762e6f76c
Merge branch 'master' of gitlab.d-labs.com:external/sap-sailing-analytics into bug4412
2018-11-12 11:40:05 +01:00
Steffen Schäfer
67b16f1705
Fixed edit of a user if the current user does not have permission to see
...
already associated roles
2018-11-12 11:12:40 +01: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
Manuel Zedel
2ed23d73a6
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412
2018-10-12 18:59:17 +02:00
Manuel Zedel
df4f3ae1fd
Merge branch 'master' of gitlab.d-labs.com:external/sap-sailing-analytics into bug4412
2018-10-12 15:58:18 +02:00
Kai Börnert
3048e1dbc0
Merge branch 'master' into permission-vertical
2018-10-11 17:41:08 +02:00
Axel Uhl
e6e322d358
Merge branch 'master' into bug4104
...
Change-Id: Iaa1100b38a5197a5ede4e3a175d177dbfad94dca
2018-10-09 18:01:29 +02:00
Axel Uhl
52c819d6e7
fixed passing on of quoted keyword queries through REST API
...
Change-Id: I2cb64dca46d7688ec5224dd17ef04f50249d5e45
2018-10-09 17:57:48 +02:00
Kai Börnert
551c6376dc
Merge branch 'bug4766' into permission-vertical
2018-10-08 16:28:32 +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
Kai Börnert
162dab5125
bug4766 fixed Util.latest
2018-10-04 14:59:07 +02:00
Kai Börnert
d5d62ab68e
bug4766 added Utils.latest to determine the latest entry in an
...
Iterable<T extends Timed>
2018-10-04 14:26:20 +02:00
D067890
8b7a00ad10
bug4104: fixed resizing problem
2018-10-02 16:22:20 +02:00
D067890
7708222141
bug4104: First approach of implementing image service
2018-09-25 16:05:56 +02:00
Axel Uhl
768983e7a1
use Iterable instead of List in MediaTagConstants, replicating an equal earlier change to MediaConstants
...
Change-Id: I4b2b0b16a7d358eed58586e6d2aa632ded04a7a8
2018-09-14 10:39:10 +02:00
Axel Uhl
8bf731a105
use Iterable instead of List in MediaTagConstants, replicating an equal earlier change to MediaConstants
...
Change-Id: I4b2b0b16a7d358eed58586e6d2aa632ded04a7a8
2018-09-14 10:37:34 +02:00
Axel Uhl
f1967c8665
Merge branch 'master' into permission-vertical
...
Change-Id: Ibb2d345e6e9c8b073d68514331e13a732677e4e4
2018-09-14 10:24:14 +02:00
Axel Uhl
19627ee2fe
Merge branch 'master' into permission-vertical;
...
converted uses of Mode.* to DefaultModes.*
Change-Id: I2790463b1df68a1616971996d20aa4bd5dbbe1d7
2018-09-13 17:55:24 +02:00
RobinFleige
596d3c04a9
Final refactoring
2018-09-12 15:04:20 +02:00
RobinFleige
578dcbcc23
Added JavaDoc, used CodeFormater on all changes in this branch, some refactoring
2018-09-11 14:34:02 +02:00
RobinFleige
4150dac4bc
RefactoringV2
2018-09-06 10:49:12 +02:00
RobinFleige
f60fee4d42
RefactoringV1
2018-09-05 17:14:29 +02:00
Manuel Zedel
9512fb67f4
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412
2018-08-22 20:16:47 +02:00
Manuel Zedel
f3646d63b3
unified quotes
2018-08-22 15:31:16 +02:00
Manuel Zedel
bcc2fa9f22
streamlined dependencies
2018-08-22 15:24:45 +02:00
Alessandro Stoltenberg
fa49836b95
bug4134_2: Moved ColorMapper and ValueRangeFlexibleBoundaries to com.sap.sse.common and the tests to com.sap.sse.common.test
2018-08-21 17:19:04 +02:00
Manuel Zedel
60e8eb32c8
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412
2018-08-13 13:47:48 +02:00
Steffen Schaefer
c3db805b1d
Bug 4427: Cleanup of old GWT plugin configs. We are preparing changes on
...
other branches that would require redundant updates of the IDE configs.
Finishing the Oxygen update by doing a cleanup will help to reduce the
effort needed to keep the IDE files up to date.
2018-08-02 15:07:14 +02:00
Manuel Zedel
d0baf771b8
removed deprecated sub-package version information
2018-07-19 17:51:25 +02:00
Axel Uhl
6127967114
Merge branch 'master' into permission-vertical
...
Change-Id: I056fa53fd62de0aefbcbcb0e52c824f4764e2a27
2018-06-12 22:04:26 +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
ee4d380d97
adjusted Trinidad/Tobago three-letter ISO code from TRI to TTO
...
Change-Id: Ia550f3898786ee21c93b73a9136d01c1b8d3c012
2018-05-22 23:40:50 +02:00
Axel Uhl
412836671e
Merge branch 'master' into permission-vertical
...
Change-Id: I96dfc85a9d7aeb76d3e7aa20783da121f207d360
2018-05-15 18:16:39 +02:00
Kai Börnert
7aea4f50b1
Merge branch 'master' into bug4523
2018-05-07 10:19:43 +02:00
Axel Uhl
4d4af9ef62
changed Singapore's IOC code from SIN to SGP (IOC changed from 2016 to 2017)
...
Change-Id: I143795943c75a48e0d20f82b5504946499afbe53
2018-05-05 23:04:30 +02:00
Maximilian Groß
53f4c40a20
Merge branch 'master' into bug4491
...
# Conflicts:
# 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/server/SailingServiceImpl.java
2018-04-27 12:10:44 +02:00
Axel Uhl
1bd7d035e8
throw proper serializable exception when pairing list generation fails; fix NPE when no callback is provided to a dialog
...
Change-Id: I717428afb1204252aede0165b42ed8216cb0503e
2018-04-26 15:43:30 +02:00
Axel Uhl
ad99a56209
replaced CompetitorWithBoatDTO by CompetitorDTO where possible
...
Change-Id: Iabb14f5e5f3989cc96128120955f0d4ae4332d23
2018-04-23 18:46:33 +02:00
Maximilian Groß
63ff06a931
Merge branch 'master' into bug4491
2018-04-23 15:53:06 +02:00
Kai Börnert
7068397641
bug4523 initial video flipping logic
2018-04-23 14:04:09 +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
d1130f5517
use @Deprecated to mark GWT-only default constructor of TimeRange
...
Change-Id: Ic802bb8e82f25a51172473dd66fb796f82d8e5cc
2018-04-19 23:11:31 +02:00
Axel Uhl
305d2bfa8e
Merge branch 'master' into bug4436
...
Change-Id: I44bcdd0cc9e7b50b8bf2340e9473a4d29dfaff4a
2018-04-19 22:57:05 +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