 Simon Pamies
|
35c89409e8
|
Merge remote-tracking branch 'origin/bug2989'
|
2015-06-21 07:13:01 +01:00 |
|
 Axel Uhl
|
6089289b3e
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-06-21 01:51:53 +02:00 |
|
|
Axel Uhl
|
a10e029c49
|
removed unused addDummyTrackedRace method from ImportMasterDataOperation; it was used before switching master data import to serialization
|
2015-06-21 01:50:47 +02:00 |
|
|
Axel Uhl
|
42dedcecfd
|
bug 2467 #19: passing through RacingEventService as RaceLogResolver; added as transient field to TrackedRace, restored after initial load in RacingEventServiceImpl
|
2015-06-20 23:57:50 +02:00 |
|
|
Axel Uhl
|
d2113723a9
|
RacingEventServiceImpl now implements RaceLogResolver
|
2015-06-20 21:07:46 +02:00 |
|
|
Axel Uhl
|
e37a649a0a
|
Merge branch 'bug2977' into jbross-dependent-race-start
|
2015-06-20 19:40:14 +02:00 |
|
|
Axel Uhl
|
d852134642
|
require X-ray to be up in order to automatically infer its down time based on the start time
|
2015-06-20 19:36:14 +02:00 |
|
|
Axel Uhl
|
0ab329ba61
|
Merge branch 'bug2977' into jbross-dependent-race-start
|
2015-06-20 19:08:26 +02:00 |
|
|
Axel Uhl
|
7cd0d55454
|
solution proposal for bug2989: use getStartOfRace() instead of getStartTimeReceived() and default to "now" if no start time is known yet
|
2015-06-20 19:04:26 +02:00 |
|
|
Axel Uhl
|
da851fb24e
|
Merge remote-tracking branch 'server/master'
|
2015-06-20 18:55:01 +02:00 |
|
|
Axel Uhl
|
a78d7cd56a
|
fixed isIndividualRecallDisplayed() for bug2977
|
2015-06-20 18:45:18 +02:00 |
|
|
Axel Uhl
|
214751d09c
|
Merge branch 'master' into bug2977
|
2015-06-20 17:39:58 +02:00 |
|
|
Axel Uhl
|
798bb77978
|
fix for bug 2988: NPE in LeaderboardDTOCalculationReuseCache
|
2015-06-20 17:29:59 +02:00 |
|
|
Simon Pamies
|
a103e217dd
|
Merge remote-tracking branch 'origin/master'
|
2015-06-20 16:23:56 +01:00 |
|
|
Simon Pamies
|
0dff22a168
|
Fixed NPE when race is null
|
2015-06-20 16:23:44 +01:00 |
|
 fmittag
|
5198c25fd7
|
Merge remote-tracking branch 'origin/master'
|
2015-06-20 16:15:34 +02:00 |
|
|
fmittag
|
e4bb9a8432
|
Merge remote-tracking branch 'origin/ubilabs--rcapp--master'
|
2015-06-20 16:15:13 +02:00 |
|
 Peter Siegmund
|
ad5ab35194
|
Bug 2979 - Editing of Values in Race Summary
|
2015-06-20 16:11:47 +02:00 |
|
|
Peter Siegmund
|
0cb59907e4
|
RCApp: implementing time change fragments
|
2015-06-20 16:11:16 +02:00 |
|
|
fmittag
|
a4b2f9ef1a
|
fix for deserialization problem with RaceLogFixedMarkPassingEventDeserializer
|
2015-06-20 16:10:51 +02:00 |
|
|
Simon Pamies
|
d345a7e9a1
|
Merge remote-tracking branch 'origin/master'
|
2015-06-20 15:04:59 +01:00 |
|
|
Simon Pamies
|
145e5ab8f2
|
Lowering time where minutes are displayed on regatta overview
|
2015-06-20 15:04:46 +01:00 |
|
|
fmittag
|
268204d5df
|
fixed launch config
|
2015-06-20 15:55:53 +02:00 |
|
|
Peter Siegmund
|
1a749cb78d
|
RCApp: set finishing und finished time into managed race with checks
|
2015-06-20 15:53:41 +02:00 |
|
|
Axel Uhl
|
bff98361d0
|
added a test case for bug 2986
|
2015-06-20 15:04:57 +02:00 |
|
|
Simon Pamies
|
ef5811e6bb
|
Fixed time window that determines the live race; also fixed strings
|
2015-06-20 13:51:07 +01:00 |
|
|
Axel Uhl
|
75d4af4e55
|
Merge remote-tracking branch 'server/master'
|
2015-06-20 14:18:40 +02:00 |
|
|
Axel Uhl
|
ae27b4e3a2
|
fix for bug 2986: making TrackedRaceImpl.gpsFixStore transient and initialize it to EmptyGPSFixStore.INSTANCE in readObject
|
2015-06-20 14:15:45 +02:00 |
|
|
fmittag
|
bbdf95ceb2
|
fix for bug 2983 Confusing live race state after restartConfusing live race state after restart
|
2015-06-20 14:06:36 +02:00 |
|
|
Peter Siegmund
|
35105ca801
|
sorting flags by name in preferences
|
2015-06-20 13:57:23 +02:00 |
|
|
Peter Siegmund
|
ddadfc0165
|
Change unit test to mockito
|
2015-06-20 12:02:57 +02:00 |
|
|
Peter Siegmund
|
89a4f0f051
|
Merge branch 'ubilabs--rcapp--feature--finishing-since' into ubilabs--rcapp--develop
|
2015-06-20 10:52:41 +02:00 |
|
|
Peter Siegmund
|
e3b4f45cea
|
RCApp: show time since finishing start
|
2015-06-20 10:50:56 +02:00 |
|
|
Axel Uhl
|
bf200242db
|
Merge branch 'master' into bug2981
|
2015-06-19 17:35:58 +02:00 |
|
|
Axel Uhl
|
b11f9aeaba
|
Updated kieler woche 2015 (markdown)
|
2015-06-19 15:14:18 +00:00 |
|
|
Simon Pamies
|
e2e9e8da8d
|
Merge remote-tracking branch 'origin/master'
|
2015-06-19 16:08:01 +01:00 |
|
|
Simon Pamies
|
a0c424b142
|
Merge remote-tracking branch 'origin/ubilabs--rcapp--master'
|
2015-06-19 16:07:49 +01:00 |
|
|
Axel Uhl
|
cb85e9d25a
|
Updated kieler woche 2015 (markdown)
|
2015-06-19 14:58:58 +00:00 |
|
|
Axel Uhl
|
a8449200de
|
Updated kieler woche 2015 (markdown)
|
2015-06-19 14:57:38 +00:00 |
|
|
Axel Uhl
|
7472abbd1b
|
fixed bug 2981 and added test case; null wind caching was faulty
|
2015-06-19 16:26:02 +02:00 |
|
|
Peter Siegmund
|
33123aa3ba
|
deactivate testing while build and moved it to a separate task
|
2015-06-19 15:30:26 +02:00 |
|
|
Peter Siegmund
|
88495f692f
|
activate junit tests in Shared, Tracker and Buoy projects (with some easy tests)
|
2015-06-19 15:29:41 +02:00 |
|
|
Simon Pamies
|
a7e3ba15a6
|
Fixing bug preventing JSON to be parsed
|
2015-06-19 13:21:24 +01:00 |
|
|
Peter Siegmund
|
9e908b5cb5
|
Bug 2817 - By Marks Coursdesigner - Not Working
change from onLongClick to onClick
|
2015-06-19 14:16:40 +02:00 |
|
|
Peter Siegmund
|
8ff5aea866
|
Merge branch 'ubilabs--rcapp--new-testing'
|
2015-06-19 13:18:34 +02:00 |
|
|
Peter Siegmund
|
d6f5264e16
|
Merge branch 'ubilabs--rcapp--new-testing' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--new-testing
|
2015-06-19 13:18:06 +02:00 |
|
|
Peter Siegmund
|
f72208dd6d
|
Added JUnit tests for Android into build script (rcapp only yet)
|
2015-06-19 13:17:57 +02:00 |
|
|
Axel Uhl
|
6112b16b26
|
checked in launch configuration for RCApp unit tests
|
2015-06-19 13:11:20 +02:00 |
|
|
Axel Uhl
|
3b5de63375
|
construct managed race identifier in test case using ManagedRaceIdentifierImpl
|
2015-06-19 13:09:10 +02:00 |
|
|
Peter Siegmund
|
9410b6b557
|
added missing escape sequence
|
2015-06-19 12:37:30 +02:00 |
|