Axel Uhl
673f8568b1
Merge remote-tracking branch 'server/bug3703' into bug3703
2016-06-15 23:13:41 +02:00
Axel Uhl
74316cff77
fixing issue with smartphone view of ALL regattas which didn't show anything
...
Change-Id: I17ddf0c5616a9ef4ea22073b1290811592022bae
2016-06-15 22:55:08 +02:00
Axel Uhl
1e4ca41d6e
formatting and renaming only
...
Change-Id: I15a4010a7b2879cc09f2ba5115db42a1ab464a14
2016-06-15 22:54:13 +02:00
Axel Uhl
4cf1a2cbe9
removed obsolete commented code
...
Change-Id: I59cf98a6785d0508cb092960c6c57c87438842c1
2016-06-15 22:52:20 +02:00
Benjamin Barth
949da383f6
Adjsuted CSS for leaderboardGroupNames filter dropdown
2016-06-15 17:10:02 +02:00
Axel Uhl
7a00161c2e
fixed filter for regatta list, now filtering for multiple leaderboard groups
...
Change-Id: I314d58fe67e07755ff3410f431d48ea519ea5ae9
2016-06-15 16:34:09 +02:00
Axel Uhl
d3fd909a2a
allow regattas to be part of more than one leaderboard group on the client side
...
Change-Id: I8db4999b40dac550455f855d86cc736378c67c87
2016-06-15 16:14:23 +02:00
Axel Uhl
4b5409342d
made boatCategory comparison null-safe
...
Change-Id: I69169e6e3a8a44f4e1319a54330ebe4d1c28bdcc
2016-06-15 12:24:09 +02:00
Axel Uhl
33eecb1b91
formatting change only
...
Change-Id: I81efc7a74115faee9428bd91d8f6cb4923f2f5a4
2016-06-15 12:00:43 +02:00
Axel Uhl
2a54bdc2c7
formatting changes only
...
Change-Id: Ifbf57b075c4b123f7761805eb035a0ea22a5afb2
2016-06-15 11:54:44 +02:00
Axel Uhl
8fb5c8cf42
reverted Selenium lookup timeout from 10s to 5s
...
Change-Id: I7e79f08bbc5fabc5f4b25fdcc9dbf9d5ec633698
2016-06-15 11:35:04 +02:00
Axel Uhl
11eaf3d573
Merge branch 'master' into bug3703
2016-06-15 11:27:50 +02:00
Axel Uhl
c2a269abb5
copied translations from _zh_CN to _zh
...
Change-Id: Ib77f6ad6d2f3d792cf517b388ae1cbc0ad365617
2016-06-15 10:15:48 +02:00
Axel Uhl
d8ef0f78f4
Merge branch 'translation'
2016-06-15 10:12:00 +02:00
Axel Uhl
18654db22b
Merge branch 'master' into ubilabs--rcapp--bug-3694
2016-06-15 09:53:21 +02:00
Peter Siegmund
f531c62da5
added javadoc
2016-06-15 09:40:18 +02:00
service.tip.git
2280840bbd
Localization delivery: commit by Albert Kwiatkowski, and the user email is albert.kwiatkowski@sap.com.
2016-06-15 07:38:22 +00:00
Peter Siegmund
7174bb87fe
hotfix for "Refresh Data"
2016-06-15 08:44:49 +02:00
Axel Uhl
a5244a561a
extended the Selenium element lookup timeout from 5 to 10 seconds
...
Change-Id: If952c18625f4c06015b2ec505418e8493e89cc37
2016-06-15 08:30:43 +02:00
Axel Uhl
1cb57307e3
add the local classloader to the master RacingEventService's master data class loaders to ensure lambdas can be de-serialized
...
Change-Id: If1fc062641307dfc6efa450aa865517b15e5234b
2016-06-15 07:48:38 +02:00
Axel Uhl
c1d6265645
use anonymous inner subclasses (and force this) to instantiate RacingEventServiceImplMock so that serialization context class loader is fine
...
Change-Id: I88b90ca6819c922046174a805841643bd50d260f
2016-06-15 02:19:04 +02:00
Axel Uhl
7285d28df3
Merge branch 'master' into bug2825
2016-06-15 01:51:04 +02:00
Axel Uhl
bd0961a83d
suggested fix for bug 3701: distinguish RegattaMetadataDTO if they reference different leaderboard groups ("boatCategories")
...
Change-Id: I118098bc327306f40911a46a23afb0a8b384e059
2016-06-15 01:42:27 +02:00
Axel Uhl
53eba9f9d0
whitespace/formatting change only
...
Change-Id: Ib7c0abb773c7df8efb8e1a9009aab6930e5ab74d
2016-06-15 01:40:23 +02:00
Axel Uhl
803d9e488e
formatting and comments only
...
Change-Id: I719e26661f17f7d129aa65a63059a09715dd2187
2016-06-15 01:16:31 +02:00
Peter Siegmund
5df392605d
fixed issue 3701
2016-06-14 22:42:37 +02:00
Axel Uhl
8d8081edd5
removed duplicate text from race management app release notes document
...
Change-Id: If4d01a1947bab5553ca3003bd2641ccf9a291ee1
2016-06-14 21:35:56 +02:00
Axel Uhl
30d494d01f
updated race management app's release notes for bug 3694
...
Change-Id: Ia7e66267ac4c519458e3d5994a7b0ce2b299dcc5
2016-06-14 21:17:59 +02:00
Axel Uhl
fafc9272d5
Merge remote-tracking branch 'server/master'
2016-06-14 21:15:44 +02:00
Peter Siegmund
971fbc6a2f
set ellipsize from end to middle in NavDrawer
2016-06-14 19:03:12 +02:00
Axel Uhl
a378d3dd65
removed unused field "wakeUp"
...
Change-Id: I0fce9cb6c4ba178133443bfd51d990a6e5026baf
2016-06-14 18:18:40 +02:00
Axel Uhl
545adb40ec
Merge branch 'master' into ubilabs--rcapp--bug-3694
2016-06-14 18:17:06 +02:00
Axel Uhl
2c28adb958
added release notes entry for race management app
...
Change-Id: I6c23092eee648d7fac777b3a5dbb3ef0ab093bbf
2016-06-14 18:13:48 +02:00
Axel Uhl
2dea6758b9
Merge branch 'master' into ubilabs--rcapp--bug-3525
2016-06-14 17:29:06 +02:00
Peter Siegmund
8fc651a67b
disable Set Time button after fragment creation
2016-06-14 17:14:22 +02:00
Axel Uhl
81efcd480e
added all dependencies of com.sap.sailing.server to com.sap.sailing.server.testsupport;
...
The RacingEventServiceImplMock used there is a replicable, and its classloader is used to resolve
objects serialized during master data import and replication. This will only work if the same
dependencies are mimiked that com.sap.sailing.server has; ugly, but this should work and let
us use this mock class from several places
Change-Id: I027deb457e83d18cd29d96458a3cfc198cbcec4a
2016-06-14 16:48:13 +02:00
Peter Siegmund
b21c010592
activate Set Time button for relative start time
2016-06-14 16:42:57 +02:00
Peter Siegmund
f39db6f607
activate Set Time on offset change for relative start time
2016-06-14 16:15:49 +02:00
Peter Siegmund
93bc05c96b
activate Set Time button on absolute tab after value change
2016-06-14 16:11:44 +02:00
Peter Siegmund
7ee189fba8
show AlertDialog after changing no-public-events preference, if logged in
2016-06-14 15:00:47 +02:00
Peter Siegmund
034d14c9b1
another solution for #3598 - which doesn't interfere an app start while screen locked
2016-06-14 12:37:35 +02:00
Peter Siegmund
b22ee171bb
restart LoginActivity, if server base url changed
2016-06-14 11:38:50 +02:00
Peter Siegmund
86df691c4c
fixed wrong string format
2016-06-14 11:37:00 +02:00
Axel Uhl
05e621d89e
removed unnecessary exports from com.sap.sailing.server.test fragment because no other bundle/fragment requires this fragment
...
Change-Id: Ic6f268b0e62f69a577996f85f1a8fdc7afe43ae2
2016-06-14 11:09:34 +02:00
Peter Siegmund
df58953451
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
2016-06-14 08:35:07 +02:00
Axel Uhl
249cf34e28
Merge branch 'master' into bug2825
2016-06-14 01:22:38 +02:00
Axel Uhl
7424772e64
Merge remote-tracking branch 'server/master'
2016-06-14 01:21:34 +02:00
Axel Uhl
d981e20cd0
Merge remote-tracking branch 'origin/master'
...
Conflicts:
java/com.sap.sse.security.ui/Security UI sdm.launch
Change-Id: I920b3602e124539ee35c07f0351f9133d38e1bee
2016-06-14 01:20:13 +02:00
Axel Uhl
e73fb1ef85
Merge remote-tracking branch 'home/bug2825' into bug2825
2016-06-13 20:48:58 +02:00
Axel Uhl
5469972ff0
Merge remote-tracking branch 'server/master' into bug2825
2016-06-13 20:48:14 +02:00