Steffen Schaefer
7c7fdf1064
Merge branch 'master' into foiling
2016-09-26 08:22:54 +02:00
Axel Uhl
928dff54b2
bug 3920: introducing MaxPointsReason "STP"
...
Change-Id: I4876baa11fb7a32c236ef8da4f47e8f57ef6258b
2016-09-22 13:22:43 +02:00
Steffen Schaefer
0cb60280d4
Added field columnCount to BravoSensorDataMetadata for convenience use
2016-09-15 10:24:24 +02:00
Steffen Schaefer
037b964e0d
Merge branch 'master' into foiling
2016-09-12 09:18:18 +02:00
Axel Uhl
69379e1815
fix for bug 3826: if a suppressed competitor's ID cannot be found in the leaderboard's competitors set, ignore that competitor instead of returning null from RaceCOmpetitorSet.computeCompetitorsFromIDs
...
Change-Id: I9ffb7d2ea88359c1e95670b93ef0b215a3fdabb2
2016-09-08 18:17:09 +02:00
Steffen Schaefer
20fc0bbe52
Added equals/hashCode to DoubleVectorFixImpl for improved testability
2016-09-07 14:07:25 +02:00
Adrian Riedel
ec50d0f1ff
updated links to sap sailing wiki (they were broken due to new file structure) in source code comments
2016-08-26 13:40:58 +01:00
Axel Uhl
3ea81203b4
fixed URL decoding issue, with a .common bundle being unable to resolve java.net.URLDecoder in GWT compile
...
Change-Id: Iea4b660123fc579d413aa56ab532e6a85e8a8dae
2016-08-16 16:28:03 +02:00
Axel Uhl
4cff2ffc1f
bug 3808: URL-encoding and -decoding the device configuration for the QR code as well as when parsing the QR code URL in the app
...
Change-Id: I7a2a71e5dd31ec87fb10d8d9e57c88cae0a803dd
2016-08-16 15:40:25 +02:00
Benjamin Barth
04c91e8352
Added additional JavaDocs to BravoFix class
2016-07-27 11:51:18 +02:00
Axel Uhl
92ff7cccda
Merge branch 'master' into bug3798
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.www/release_notes_admin.html
Change-Id: I62653e839d19957e48a292497c8d13b29a90c0fe
2016-07-21 13:10:14 +02:00
Axel Uhl
221cee122d
added maximumNumberOfDiscards throughout the Series maintenance, persistence, UI and replication chain
...
Change-Id: Id91a6e82f6445bb2de826d2fcf1ed7b5bf4ba853
2016-07-21 12:25:47 +02:00
Axel Uhl
7eff56ad65
Merge branch 'master' into bug3785
2016-07-19 13:13:53 +02:00
Axel Uhl
7b6376d9a7
added scoring scheme LOW_POINT_TIE_BREAK_BASED_ON_LAST_SERIES_ONLY
...
Change-Id: I471fb6c882406414940d39ff43f1a4b5dd598baf
2016-07-18 17:48:18 +02:00
Steffen Schaefer
1b0e69448f
Merge branch 'master' into bug2775
2016-07-14 08:29:26 +02:00
Axel Uhl
e4fcb163f8
added boat class logos for RS?00, RSAero and Splash boat classes
...
Change-Id: Ifcf9f5a5c5f06648a1f000f31b14120597d5b100
2016-07-13 00:04:11 +02:00
Benjamin Barth
9990ddf8d6
Added Comparable interface to BoatClassDTO
2016-07-11 15:25:06 +02:00
Steffen Schaefer
793c2c0341
Merge branch 'master' into bug2775
...
Conflicts:
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/Activator.java
2016-07-11 11:18:46 +02:00
Steffen Schaefer
d85ab8b470
The NotificationPreferences are now backend specific by using lookup
...
mechanisms for BoatClasses and Competitors. With this the
NotificationPreferences can't be used in the GWT UI anymore. Currently
the UI doesn't compile -> this needs to be fixed in a subsequent commit
2016-07-11 10:50:19 +02:00
Steffen Schaefer
b5524aefde
JavaDoc / Code quality improvements
2016-07-11 09:38:17 +02:00
Steffen Schaefer
8059be9fb7
Implemented specific setting to handle BoatClassMasterdata
2016-07-06 11:40:28 +02:00
Steffen Schaefer
051b5448d2
Registered NotificationPreferences on UserStore to hold instances in
...
memory
2016-07-05 15:11:22 +02:00
Steffen Schaefer
ac2b198709
Initial implementation of NotificationPreferences
2016-07-05 15:10:18 +02:00
Benjamin Barth
541ec499c6
Adjusted matching strings for boat class suggestion filter
2016-06-30 09:58:55 +02:00
Steffen Schaefer
bc777d98c2
Merge branch 'master' into foiling
2016-06-29 15:20:27 +02:00
Axel Uhl
b26b998866
removed RaceLiveState in RaceDTO, together with RaceDTO.getLiveState(long); both were unused
...
Change-Id: I8523318b95926ab2c5b1bc4f2dc1a1d121975ea3
2016-06-29 09:29:22 +02:00
Steffen Schaefer
ae04b66800
Merge branch 'master' into foiling
2016-06-29 09:01:17 +02:00
Steffen Schaefer
bd020e8c39
Renames/JavaDocs/... during code review
2016-06-29 09:00:04 +02:00
fmittag
80070e2dbf
Merge remote-tracking branch 'origin/bug3716_matchracing'
2016-06-28 18:38:11 +02:00
Steffen Schaefer
0a1b56765c
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
2016-06-27 16:15:41 +02:00
Axel Uhl
859b71d479
added PINK as fleet color
...
Change-Id: I59f9e9d3156d9584b9fd07a6d0dd7a9fe52997d7
2016-06-27 10:37:08 +02:00
Steffen Schaefer
f2bc540daa
Added more JavaDocs
2016-06-23 14:49:43 +02:00
Steffen Schaefer
3c9f31eb3b
Added JavaDocs for SensorFix and DoubleVectorFix related classes
2016-06-23 11:59:25 +02:00
Steffen Schaefer
853c1ee316
Merge branch 'master' into foiling
2016-06-14 08:42:49 +02:00
Axel Uhl
105fb5c60f
added 5.5mR boatclass
...
Change-Id: I03d599458bf1268dd2ba09d2ab8d5fa7882864e8
2016-06-13 13:21:01 +02:00
Steffen Tobias Wagner (D059727)
5e4951a696
added sunbeam 22 boatclass to BoatClassMasterdata to fix bug3692
2016-06-09 15:57:51 +02:00
Steffen Schaefer
4597ee9882
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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/shared/charts/AbstractCompetitorRaceChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartSettings.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-06-09 08:52:37 +02:00
Axel Uhl
d27f243d3a
added assert statements that validate constraints in MediaLibrary so far expressed only as a comment
...
Change-Id: I4ee9e5dc0f0c60ec1e6216e3b2b39ac766c13f0b
2016-06-07 11:53:35 +02:00
Steffen Schaefer
dafe1a47c2
Merge branch 'master' into foiling
2016-05-31 08:45:38 +02:00
Axel Uhl
81620b3850
added "Platu25" as an alias name for "Platu 25"
...
Change-Id: I4c8a7cb794b9ba93525bf018891f00fb0724e4a7
2016-05-28 23:47:09 +02:00
Benjamin Barth
60bca7d374
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackFileImportWidget.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
2016-05-19 14:02:20 +02:00
Axel Uhl
27476cc851
Merge branch 'master' into ubilabs--rcapp--bug-3624
2016-05-13 08:37:42 +02:00
Axel Uhl
96235b08cc
Merge remote-tracking branch 'server/master'
2016-05-13 00:38:34 +02:00
Axel Uhl
d16e46d02f
Merge branch 'master' into translation
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
2016-05-12 18:46:17 +02:00
Steffen Tobias Wagner (D059727)
9d83bc51de
Added M32 catamaran boat class masterdata
2016-05-12 18:19:02 +02:00
Axel Uhl
fbd79b6dde
failing test case for bug 3648; introduced Speed.travel(Duration)
...
Change-Id: Ib164a12b0330f8c99251031553866435e82632fe
2016-05-11 15:15:05 +02:00
Peter Siegmund
cb4ae30b59
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3624
2016-05-03 09:20:04 +02:00
Steffen Schaefer
d6c67ff0fd
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.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
2016-05-03 08:29:04 +02:00
Axel Uhl
ecb7a6beba
Merge branch 'bug3641' into translation
2016-05-03 00:46:20 +02:00
Axel Uhl
9d43227986
part three of bug3641: renamed realTotal to total; should be done now; let's wait for the tests
...
Change-Id: Ie91dbcd94fb52cba0a928389b3d531bf44750000
2016-05-02 16:33:58 +02:00