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
fmittag
c82a62ae4c
added a test to check the tie break rule for the german sailing league 2016 for an opening series and a medal series with 3 races where the races of the medal series are ranked higher than the races of the opening series in case of an overall tie
2016-04-20 18:57:41 +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
6ac0e599fd
introduced dedicated message string for "Manage2Sail Event" instead of concatenating
...
Change-Id: I4f6f60766b69c23f46c073ae9bae1b80e27fa3dc
2016-04-20 17:20:43 +02:00
Axel Uhl
18e89d6e23
Merge branch 'master' into ubilabs--tracking_app--develop
2016-04-20 16:38:08 +02:00
Konstantin Gonikman
2ed571a54d
- fixed: settings and about dialogs
2016-04-20 16:33:29 +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
8bbd025e6e
updated Android Studio version
2016-04-20 13:03:50 +02:00
Peter Siegmund
6bc4759c14
Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop
2016-04-20 13:02:21 +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
21cd231707
updated versions of Android-related libraries to better align Eclipse debug experience with production code
...
Change-Id: I4b5367f3569a25e2aa446d399d72f32316594a31
2016-04-19 18:50:04 +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
Peter Siegmund
6e8137628b
set text color with fixed value from custom style (because of API <= 19)
2016-04-18 21:45:36 +02:00
Axel Uhl
255c4c198c
Merge branch 'translation' into ubilabs--rcapp--develop
2016-04-18 21:27:17 +02:00
Axel Uhl
3d69ff2cd4
removed another redundant _en file
...
Change-Id: I0708a52b978bc35ce814356f4eb74287b94242f2
2016-04-18 21:22:02 +02:00
Axel Uhl
29453c91e5
removed redundant _en file
...
Change-Id: Iade51020e0aa71dcad50bd39c3124c3ded279760
2016-04-18 21:21:24 +02:00
Axel Uhl
358adc0865
re-introduced Unicode escapes where we had them
...
Change-Id: I57750746cd79c32945584bec1234923d123d3a7c
2016-04-18 21:19:49 +02:00
Axel Uhl
9ccd8a8714
removed redundant StringMessages_en.properties
...
Change-Id: I48fc3210c1a9eab465053068713b205ac4c33690
2016-04-18 21:11:22 +02:00
Axel Uhl
aa36952e12
removed redundant TextMessages_en.properties; it duplicates TextMessages.properties and kills proper Unicode escapes
...
Change-Id: Ia84f86f8f6cc21899e1b7ec916e1fc684d6245fb
2016-04-18 21:06:38 +02:00
Axel Uhl
38d65f22ba
Merge branch 'master' into translation
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
Change-Id: I3ff3966a8ebb007d14f37ea96fc6cdcc46a17dd5
2016-04-18 20:58:27 +02:00
Axel Uhl
b62c21b1fd
Merge remote-tracking branch 'server/master'
2016-04-18 20:51:52 +02:00
Axel Uhl
cdd1441bef
fixed german translations of a few AdminConsole strings, in particular swapped before/after labels for waypoint addition buttons
...
Change-Id: I2864f67224105633d9532046b3985681b900177e
2016-04-18 20:48:44 +02:00