Commit Graph
38296 Commits
Author SHA1 Message Date
Axel Uhl 4fe1de3703 Merge branch 'master' into bug4251 2017-07-31 13:18:57 +02:00
Axel Uhl 52c7de096f Merge remote-tracking branch 'server/master' 2017-07-31 13:17:38 +02:00
Axel Uhl aaabb350b2 formatting changes only
Change-Id: I0d2a4885b9c51180ff5fd1b79d81ee41ff22a899
2017-07-31 13:08:43 +02:00
Axel Uhl 7cf82fb411 added per-leg foiling statistics
Change-Id: I8d562a27e6a8c740c0cd99c9a995fbe3d8c339cb
2017-07-31 11:44:37 +02:00
Axel Uhl db2c02dfe0 added distance foiled as statistic on Bravo fix track; aligned foiling duration for track and segment (off-by-one fixed)
Change-Id: Ida32fbd651ab05b651cd5aae3154ae3e9bf7ebad
2017-07-31 10:46:29 +02:00
Steffen Schaefer 10ca68968b Merge branch 'bug3851_inheritance' 2017-07-31 10:34:17 +02:00
Steffen Schaefer 3912ba0a5d Merge branch 'bug4248'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2017-07-31 10:28:59 +02:00
Steffen Schaefer 8f45a01535 Merge branch 'bug4248'
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2017-07-31 10:24:41 +02:00
Axel Uhl 5c7d3e52fa fixed single quotes in French translation in filestorage message files 2017-07-30 21:25:13 +02:00
Axel Uhl 5fe69ab54c temporarily fixed russian translation, adding missing placeholder at random part of the message 2017-07-30 19:41:12 +02:00
Axel Uhl 15d61f6987 amending previous commit: failed to update StringMessages.properties properly 2017-07-30 18:24:43 +02:00
Axel Uhl 1c4d7ae981 fixed typo in message name; fixed quotes in _zh and _ja locales 2017-07-30 16:41:39 +02:00
Axel Uhl 32005ede22 fixed quotes in security i18n 2017-07-30 13:28:22 +02:00
Axel Uhl e3b8504fcf removed @Connector from Competitor to Team; offer nationality on Competitor as shortcut instead
Change-Id: I8240aac41c424ec8b637a3e29fb533e81c98380a
2017-07-28 09:52:55 +02:00
Axel Uhl 0e9340084c Merge branch 'master' into bug4248
Change-Id: If8f6ada424237c2e202a4842e014185a990adfe8
2017-07-27 18:15:14 +02:00
Axel Uhl f71656dcfb Merge remote-tracking branch 'server/master' 2017-07-27 18:13:27 +02:00
Steffen Schaefer 0196005f26 Merge branch 'master' into bug3851_inheritance
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
2017-07-27 15:26:22 +02:00
Kai Boernert 3459ff05de removed sorting logic from updateSettings 2017-07-27 15:15:55 +02:00
Steffen Schaefer 0c4b757d61 Merge branch 'master' into bug3851_inheritance
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html
2017-07-27 14:16:08 +02:00
Steffen Schaefer 33f650ee09 Merge branch 'bug4199' 2017-07-27 13:51:07 +02:00
Steffen Schaefer 9f4c97a114 Bug 4199: Minor adjustment of the estimated duration overlay in case no
header is shown in the RaceMap
2017-07-27 13:31:43 +02:00
Steffen Schaefer 9c002557e0 Merge branch 'master' into bug4199 2017-07-27 13:04:48 +02:00
Axel Uhl 28ebcbb547 bug 4248: adjusted the german translations where there were doubts
Change-Id: I633f39f7d1c735271ea970c526facfc0a9b04e4b
2017-07-27 11:57:38 +02:00
Axel Uhl d32c03f785 Merge branch 'master' into bug4248 2017-07-27 11:45:13 +02:00
Axel Uhl ffbcb16544 Merge branch 'translation' 2017-07-27 11:21:26 +02:00
Axel Uhl f17575639c fixed quotes in French message translations
Change-Id: Id7246115849ba3bbc2afd9c68df00bb0e34c3450
2017-07-27 11:20:11 +02:00
Axel Uhl ec2be0a301 Merge remote-tracking branch 'server/master' 2017-07-27 09:37:12 +02:00
Axel Uhl fbb49dfb66 Merge branch 'master' into bug4248 2017-07-27 09:32:55 +02:00
Steffen Schaefer d5ef130f89 Bug 4248: Implemented some minor improvements for the german translation 2017-07-27 08:59:35 +02:00
service.tip.git 146ad449ce Translation delivery: commit by SLS (albert.kwiatkowski@sap.com)
Change-Id: I4f1d2071ec078f18c7c5e9bdaeb055d6e25e6636
2017-07-26 16:36:32 +00:00
Kai Boernert 50d5d9393c fixed multiple i18n errors 2017-07-26 16:26:58 +02:00
Axel Uhl 304cf70645 adjusted TracAPI 3.7.5 readme file
Change-Id: I08c784e2cd1773063c49d9cf84584259ee590106
2017-07-25 18:46:47 +02:00
Axel Uhl e8d731bd31 upgraded TracAPI to 3.7.5; fixes order of notifying race initialization and tracking start time
Change-Id: If611f300d37bc2a3b35dc22cbc0a85e99cef4717
2017-07-25 16:25:03 +02:00
Steffen Schaefer 3fcda18dab Merge branch 'bug4233' 2017-07-25 13:21:54 +02:00
Axel Uhl d1505e60e0 upgraded to TracAPI 3.7.4: fixes update issues that exist since 3.7.0
Change-Id: Iad6564c70aa5aab2cff1b2daacf5998bf39bbf64
2017-07-25 12:00:02 +02:00
Axel Uhl c6866d23ff removed unnecessary @SuppressWarning / cast; formatting conventions
Change-Id: I4050b6db74b3ca865231984a2b5e4adb4443d6d0
2017-07-24 21:13:05 +02:00
Axel Uhl ae00fefe9b Merge branch 'master' into bug4233 2017-07-24 21:05:43 +02:00
Axel Uhl 60629734ad Merge branch 'master' into bug4246 2017-07-24 18:29:50 +02:00
Axel Uhl 3a0ddf0014 upgraded TracAPI to 3.7.3
Change-Id: I08ff87a0af10ad63b4119898f34c054575d2ddc5
2017-07-24 18:28:52 +02:00
Axel Uhl 3c523147d9 bug 4246: use competitor names as last resort for stable sorting
Change-Id: I234c6a09dd0013e1da6e9de3fc9e085043f07903
2017-07-24 18:21:23 +02:00
Axel Uhl 7780715ea1 Merge remote-tracking branch 'server/master' 2017-07-24 17:55:08 +02:00
Axel Uhl 6635c974e8 bug 4247: don't manipulate operation before replicating it
Change-Id: I718a8210f9abfe9b375ae105614b6c59c934d2a1
2017-07-24 17:52:24 +02:00
Steffen Schaefer 83515b0c16 Merge branch 'bug4242' 2017-07-24 17:05:23 +02:00
Steffen Schaefer 212ca18500 Bug 4242: Renamed RegattaOverviewEntryDTO.regattaName to leaderboardName
because this is what gets assigned to the field
2017-07-24 16:39:37 +02:00
Axel Uhl d79176a56d Merge branch 'master' into bug4242 2017-07-24 16:25:51 +02:00
Axel Uhl 9f61d9a834 Merge remote-tracking branch 'server/master' 2017-07-24 16:24:46 +02:00
Steffen Schaefer e14e1fa261 Merge branch 'master' into bug4199 2017-07-24 16:23:15 +02:00
Steffen Schaefer 6a748bf0e6 Merge branch 'master' into bug3851_inheritance 2017-07-24 16:17:12 +02:00
Peter Siegmund 7cadbbac62 reorganise imports 2017-07-24 16:15:40 +02:00
Axel Uhl afacf97402 Merge remote-tracking branch 'server/bug4242' into bug4242 2017-07-24 16:09:02 +02:00