Axel Uhl
47ec06cffd
a first working trivial test case which checks the basic test fixture, set-up and race retrieval with status update
...
Change-Id: I8de10018477bca6bd5b9a51003acc7bcfc5df285
2016-04-22 00:04:51 +02:00
Axel Uhl
f3e9219804
a first implementation of the new current races filter algorithm according to the specification in bug 3011
...
Change-Id: I5f29d35bbbde9429bff5f3219fa6c22455c6e9d2
2016-04-21 23:01:07 +02:00
Axel Uhl
4781e03531
formatting only
...
Change-Id: I2a85ba37e507c9ab94e413b29e9c189275a72c33
2016-04-21 20:57:19 +02:00
Axel Uhl
139f5b4ad4
a first version of a nav drawer that uses a majorly refactored filter and sorting design; filter implementation still empty, test not compiling
...
Change-Id: I2711757df7d4e72f6c627d2daacabb7b22e6e16f
2016-04-21 18:23:05 +02:00
Axel Uhl
a833c463c6
preparing filter and comparator, adding stuff to FilterableRace
...
Change-Id: I8a1e54c5cadb8626a28a5647cc8c53a485e0d309
2016-04-21 14:49:15 +02:00
Axel Uhl
02fefbac8b
Merge branch 'master' into ubilabs--rcapp--bug_3011
2016-04-21 13:14:04 +02:00
Axel Uhl
bbc94b82dc
fixing PlayerActivity after introducing initialDurationAfterRaceStartInReplay
...
Change-Id: Iaf34f7d5098c731ffa012b8b4f0a36077b65a908
2016-04-21 13:12:39 +02:00
Axel Uhl
7681341db7
Merge branch 'master' into ubilabs--rcapp--bug_3011
2016-04-21 13:09:39 +02:00
Axel Uhl
2c064e9855
added a parameter "t" to the RaceBoard.html entry point that accepts a time after the start as [[hh:]mm:]ss to position the timer in replay mode
...
Change-Id: Id2e05ba3524e41e00e765c7e689a668093be15d7
2016-04-21 13:03:52 +02:00
Axel Uhl
2fe8099f61
added zeroBasedIndexInFleet to FilterableRace and ManagedRaceImpl
...
Change-Id: I0d14a949d1905ded6d84107f2f4de3af30d512b3
2016-04-21 12:40:29 +02:00
Axel Uhl
3ff77640e8
equipped RaceCell with a field zeroBasedIndexInFleet
...
Change-Id: Ic09d225dcfce73b747424f73fae794e9043c512d
2016-04-21 11:14:25 +02:00
Axel Uhl
8aff222bcc
Merge branch 'master' into ubilabs--rcapp--bug_3011
2016-04-21 10:47:12 +02:00
Axel Uhl
c44fea4c40
moved Series.isFleetsRunInParallel to SeriesBase
...
Change-Id: Ied47989eae6cee647a90ec8373fd5b5fb48cba16
2016-04-21 10:36:37 +02:00
Axel Uhl
ca2a399aee
as a first step towards solving bug 3532 this adds Series.isFleetsRunInParallel() with a default result of true
...
Change-Id: I1d81055fbe22c690ef7a4214f8156ac6de07142f
2016-04-21 10:33:26 +02:00
Axel Uhl
681c9fa84f
Merge branch 'master' into ubilabs--rcapp--bug_3011
2016-04-21 00:48:38 +02:00
Axel Uhl
4b32ef5187
in case the mimeType is not set for a video, let the user still remove it in the RaceBoard media editor
...
Change-Id: Iffbb0991357b623f8ea11fd45ace09ebefefe8d6
2016-04-21 00:09:36 +02:00
Axel Uhl
8e2db4a366
secure MediaPanel against NPEs caused by null start times
...
Change-Id: I2a9cb3de51891dc756fc195b1eaa2fd768e04ea7
2016-04-20 23:41:01 +02:00
Axel Uhl
c3f91ccc4c
extend initial connection timeout from 10s to 10min; for Master Data Import it used to be 60s and even that was close...;
...
this partly reverts a "refactoring" that was none (938e1e8cbc ) which replaced
an explicit 60s timeout with a util call that uses 10s
Change-Id: I1dbda0314550dcc77c7d69c3513d1de8430eae07
2016-04-20 22:34:14 +02:00
Axel Uhl
6eb5b3d191
check connection for null before trying to disconnect to avoid NPE in finally clause
...
Change-Id: I53c44c7ce95b27b73dbe6b7270b2dbdb86eef12e
2016-04-20 22:32:16 +02:00
Axel Uhl
b39d958fcf
renamed raceName to raceColumnName where appropriate
...
Change-Id: I3fdc09864245543f4b40a1e0a1bdfb8441706e32
2016-04-20 18:50:09 +02:00
Axel Uhl
d416b90b50
Merge branch 'master' into ubilabs--rcapp--bug_3011
2016-04-20 18:03:01 +02:00
Axel Uhl
4e35f40159
reverted launch config that was changed accidentally
...
Change-Id: I8feb182dca1193081edec454af36620c151bf42b
2016-04-20 18:01:45 +02:00
Axel Uhl
913fbe5d76
increased Shiro session manager timeout from 30min to 24h
...
Change-Id: I8bdcbc5b3c2658858643b3a4f04dfa83a571659a
2016-04-20 18:00:19 +02:00
Axel Uhl
18e89d6e23
Merge branch 'master' into ubilabs--tracking_app--develop
2016-04-20 16:38:08 +02:00
Steffen Tobias Wagner (D059727)
336d61de9a
Merge branch 'ubilabs--tracking_app--bug-3576' into ubilabs--tracking_app--develop
2016-04-20 16:02:00 +02:00
Axel Uhl
1cbb2531d3
Merge remote-tracking branch 'server/master'
2016-04-20 15:17:10 +02:00
Axel Uhl
0a417c1f88
handling null as checkin data to avoid NPE as reported by bug 3616
...
Change-Id: Ie047e91211ea0e875e140a6afada19aca8baa661
2016-04-20 15:10:49 +02:00
fmittag
a654e0ad69
fixed product definition to autstart the yachtscoring result import bundle during server start
2016-04-20 15:04:50 +02:00
Axel Uhl
78dbffad2d
Merge branch 'ubilabs--rcapp--master'
2016-04-20 13:29:54 +02:00
Axel Uhl
8e7d44f67f
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
2016-04-20 13:11:58 +02:00
Peter Siegmund
b0db06a196
fixed missing listener because of no unregister old races
2016-04-20 13:00:44 +02:00
Benjamin Barth
c9f1ef0258
Fixed competitor filter in races tab, which crashed when typing an empty
...
string
2016-04-20 10:42:20 +02:00
Axel Uhl
3d52c3628e
upgraded versions of Android apps
...
Change-Id: I393f5a77eff683c56e8e2dd1ff31f26629fb883a
2016-04-19 19:38:46 +02:00
Axel Uhl
075e329065
Merge branch 'ubilabs--rcapp--master'
2016-04-19 15:16:42 +02:00
Peter Siegmund
8908b06424
fixed crash
2016-04-19 15:08:17 +02:00
Axel Uhl
671b266e2d
Merge branch 'ubilabs--rcapp--master'
2016-04-19 14:18:14 +02:00
Axel Uhl
4bf415e864
Merge remote-tracking branch 'server/fix_autoupdate_for_playstore' into ubilabs--rcapp--develop
2016-04-19 13:19:32 +02:00
Peter Siegmund
4fa09eb223
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
2016-04-19 08:51:17 +02:00
Peter Siegmund
e282374e1e
cleaner approach for handling ManagedRaces loaded by the OnlineDataLoader
2016-04-19 08:51:03 +02:00
Axel Uhl
dff84353ac
removed preference for ws: over wss: in Igtimi connector because Jetty 9.2.2 can handle wss: just fine
...
Change-Id: I5fb059daf27278a16fb3256d04b73a94cd7f28c8
2016-04-19 00:48:23 +02:00
Axel Uhl
37158839b5
shuffle Igtimi server list so a fail-over will eventually end up at a working server
...
Change-Id: Id29af12d9c57060b6a2d8463db2f3173f0762a03
2016-04-19 00:18:22 +02:00
Axel Uhl
5da5e4738c
removed unused logging TAG declaration
...
Change-Id: I8ff27b5f627f9fc6c504bb6cd617a459a312887c
2016-04-18 23:46:00 +02:00
Axel Uhl
f00e91075f
use constants for exception message construction and matching
...
Change-Id: I3df736af045d46f1f39dbc0a36a9c0824122b6a8
2016-04-18 23:44:51 +02:00
Axel Uhl
f1fedb1d0e
fixed exception message text
...
Change-Id: I18ef82f89058202bed4806bc43e95d5fca0c1ed7
2016-04-18 23:43:10 +02:00
Axel Uhl
c73462c3d0
Updated mail relaying (markdown)
2016-04-18 21:27:41 +00:00
Peter Siegmund
44bb552661
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
2016-04-18 22:17:21 +02:00
Peter Siegmund
f2df9d96ba
fixed ConcurrentModificationException
2016-04-18 22:16:34 +02:00
Peter Siegmund
d9f6eddf89
Merge branch 'ubilabs--rcapp--bug-3440' into ubilabs--rcapp--develop
2016-04-18 21:48:51 +02:00
Peter Siegmund
453c393137
set text color with fixed value from custom style (because of API <= 19)
2016-04-18 21:48:14 +02:00
Peter Siegmund
7ea37257d3
Merge branch 'ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
2016-04-18 21:46:58 +02:00