Axel Uhl
|
7916b4af6e
|
Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop
|
2016-03-31 21:51:09 +02:00 |
|
Axel Uhl
|
9bac05597a
|
ignore device competitor mapping events if the competitor cannot be found
Change-Id: I1635047398be465a152ef946863ab32242875f75
|
2016-03-31 18:44:12 +02:00 |
|
Axel Uhl
|
8911951cba
|
improved logging in case a device mapping points to an object of unknown type or a null object
Change-Id: I54accd8b386af796b12bcfe95f0cbdba55a6b265
|
2016-03-31 18:37:55 +02:00 |
|
Axel Uhl
|
9e7ed486f3
|
Merge branch 'translation'
|
2016-03-31 09:53:44 +02:00 |
|
Axel Uhl
|
da6082b59a
|
renamed default directory for generic XRR import from xrrresults to xrrftp which is the symbolic link that exists in our AMI
Change-Id: I60294d60645a0b3e4a2f52842972074c0ea46d94
|
2016-03-30 18:17:56 +02:00 |
|
Axel Uhl
|
c803a9822b
|
Merge branch 'master' into translation
|
2016-03-30 16:31:48 +02:00 |
|
Axel Uhl
|
d2ee9e8e97
|
aftermath for c50d3ec6d6: also return available, not only course marks if no race column is provided
Change-Id: I89ffc7adfb2e0e9aa829498d3ffd7b08dfc05ac8
|
2016-03-30 16:30:16 +02:00 |
|
Axel Uhl
|
16e19460d0
|
Merge branch 'master' into translation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
Change-Id: Ib1cc0b868e11b97ca8c599dece8500a490436564
|
2016-03-30 16:07:31 +02:00 |
|
Axel Uhl
|
c63704eba8
|
filter competitors in competitor panel also by ID
Change-Id: I7ee7cb1ea32491727c0da435656d0402dc31f4f5
|
2016-03-30 15:43:14 +02:00 |
|
Axel Uhl
|
beee35fe90
|
Merge branch 'master' into translation
|
2016-03-30 14:13:59 +02:00 |
|
Axel Uhl
|
12e85354ff
|
improved logging for failure to resolve competitor during regatta log loading
Change-Id: I798d5cf58273cfe20c471e91807308161bb84f3b
|
2016-03-30 14:04:31 +02:00 |
|
Axel Uhl
|
ef79fc4728
|
when failing to resolve a competitor while loading a regatta log event, skip that competitor registration event and continue
Change-Id: I18db414ba635463e1bce399d8b09de389c16ce3e
|
2016-03-30 14:02:17 +02:00 |
|
Axel Uhl
|
c85292f1f3
|
Merge remote-tracking branch 'server/master'
|
2016-03-30 13:44:26 +02:00 |
|
Axel Uhl
|
461e08a0a8
|
moved serialized to .android.shared so Buoy Pinging app can see them
Change-Id: I52ebc9fa121b6223575f746bd90a723175b8d491
|
2016-03-30 13:42:25 +02:00 |
|
Jan Broß
|
46a49ac071
|
Merge branch 'bug3194-startStopTrackingActionColumn'
|
2016-03-30 13:01:11 +02:00 |
|
Jan Broß
|
6c79313cb0
|
Remove toggle button from SetTrackingTimesDialog
|
2016-03-30 12:59:57 +02:00 |
|
Jan Broß
|
2ef3805b9b
|
Fix reload issue when stopping tracking on panel on right hand side
|
2016-03-30 12:58:18 +02:00 |
|
Jan Broß
|
6a97808bfc
|
Set start and stop tracking time automatically, when starting/stopping tracking and no time is present
|
2016-03-30 12:20:29 +02:00 |
|
Axel Uhl
|
1bccdd7516
|
Merge branch 'master' into translation
|
2016-03-30 11:03:43 +02:00 |
|
Axel Uhl
|
c50d3ec6d6
|
return available, not only course marks from /leaderboards/{leaderboard}/marks
Change-Id: I50faf63ed4d887b633d4f5447c6b6547d30c9982
|
2016-03-30 11:02:33 +02:00 |
|
Axel Uhl
|
08d501b9d3
|
Merge remote-tracking branch 'server/translation' into translation
|
2016-03-30 10:38:52 +02:00 |
|
Axel Uhl
|
2eb172e820
|
Merge branch 'master' into translation
|
2016-03-30 10:36:26 +02:00 |
|
Benjamin Barth
|
dc9c358cfb
|
Added missing i18n properties files for _zh
|
2016-03-30 10:33:22 +02:00 |
|
Peter Siegmund
|
b2cc8b6ca8
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2016-03-30 10:18:36 +02:00 |
|
Benjamin Barth
|
d1c9015501
|
Fixed encoding of chinese i18n properties
|
2016-03-30 09:38:38 +02:00 |
|
Jan Broß
|
24373b8314
|
Merge bbug3196-startStopTrackingActionColumn into master
|
2016-03-30 09:32:34 +02:00 |
|
Jan Broß
|
782222a627
|
Autoclose tracking times dialog when using toggle button
|
2016-03-30 09:28:05 +02:00 |
|
Benjamin Barth
|
4a1c326145
|
Merge remote-tracking branch 'origin/master' into translation
|
2016-03-30 09:22:37 +02:00 |
|
Benjamin Barth
|
49081bcbab
|
Activated zh and ru locale for AdminConsole
|
2016-03-30 09:21:36 +02:00 |
|
Jan Broß
|
364101be83
|
Clean up start stop tracking action columns
|
2016-03-30 09:16:58 +02:00 |
|
Axel Uhl
|
0848126d2e
|
bug 3530: QuickRanks now use getCompetitorsFromBestToWorst for requested time point and thus are in sync with the leaderboard ranking
Change-Id: I1813bf802243d2ac7df7cca7d1a4cac2f966a807
|
2016-03-29 18:39:27 +02:00 |
|
Benjamin Barth
|
4b22e2dcbb
|
Removed not yet translated messages from chinese and russian
StringMessages
|
2016-03-29 17:53:28 +02:00 |
|
Axel Uhl
|
d42614e201
|
aftermath for bug 3540: moving the initialization of the CrossTrackErrorCache to where the TrackedRace is sufficiently initialized
Change-Id: Ic2e60d17db817a9602e0e40a459d75b3699921bb
|
2016-03-29 17:38:25 +02:00 |
|
Benjamin Barth
|
dd2b3077f8
|
Fixed encoding of chinese i18n properties
|
2016-03-29 16:51:03 +02:00 |
|
Benjamin Barth
|
1ce36f4ff4
|
Fix line brake error in StringMessages_zh.properties
|
2016-03-29 16:50:48 +02:00 |
|
Axel Uhl
|
3326b9162f
|
also make sure CrossTrackErrorCache has entries for all competitors when not suspended/resumed by triggering updates for all competitors at cache creation
Change-Id: Ic72437d321cffe663e85fa1a250e89f865b572a1
|
2016-03-29 15:39:37 +02:00 |
|
Peter Siegmund
|
827b65d6c9
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2016-03-29 15:37:35 +02:00 |
|
Benjamin Barth
|
1512e78096
|
Merge remote-tracking branch 'origin/master' into translation
|
2016-03-29 13:56:56 +02:00 |
|
Axel Uhl
|
b7ef7ce61b
|
Bug 3540: XTE empty; the fix was to use all race competitors for triggering cache updates in resume(), not only those of the (empty) cache key set
Change-Id: I20d85b5587ac5ee6072f7f4403ea1b7067c75b69
|
2016-03-29 13:43:47 +02:00 |
|
Benjamin Barth
|
7948964f98
|
Merge remote-tracking branch 'origin/master' into translation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
|
2016-03-29 13:40:03 +02:00 |
|
Benjamin Barth
|
97862b763d
|
Fixed encoding of chinese i18n properties
|
2016-03-29 13:31:47 +02:00 |
|
Benjamin Barth
|
f2d684bc2b
|
Integrated different event date formattings based on locales
|
2016-03-29 13:30:50 +02:00 |
|
Benjamin Barth
|
3d06b11413
|
Created exchangeable implementations for event date formatting
|
2016-03-29 13:30:05 +02:00 |
|
Axel Uhl
|
6f1fca66f4
|
Merge remote branch 'origin/mark-passing-probability'
|
2016-03-27 19:22:55 +02:00 |
|
Axel Uhl
|
e92d513c3b
|
set start of tracking time to t(0) for test case; otherwise now it would receive "now" as start time, excluding test fixes
|
2016-03-27 03:44:51 +02:00 |
|
Axel Uhl
|
9611c57463
|
fixed TimeRangeTest.union which erroneously relied on specifics of BeginningOfTime and EndOfTime
|
2016-03-27 03:32:05 +02:00 |
|
Axel Uhl
|
eb6ce3b83a
|
when starting tracking for race log tracking with no start of tracking time in race log, add a start-of-tracking time to race log
Change-Id: I7723b226b86f81fae2e15aa6cf223505216c0463
|
2016-03-26 20:51:31 +01:00 |
|
Axel Uhl
|
d243d5e52e
|
no longer infer race start/end of tracking from device mapping intervals
Change-Id: Ieddfd53ba067acd2cc3524d5a4e74929ca04cdd9
|
2016-03-26 12:41:22 +01:00 |
|
Axel Uhl
|
89378bed12
|
using a deferred scheduled command for resetting chart zoom; this seems to ultimately fix 3536
Change-Id: I4a145dcaba73f768d322299a113940562a7ad462
|
2016-03-25 19:03:08 +01:00 |
|
Axel Uhl
|
bea01b905b
|
formatting only
Change-Id: Ibf570339e205ae79718d8567b2cab8a0c8a89306
|
2016-03-25 19:02:29 +01:00 |
|