 Axel Uhl
|
79814a9750
|
Merge remote-tracking branch 'server/master'
|
2016-12-05 11:10:29 +01:00 |
|
 Peter Siegmund
|
98dac9d982
|
Merge branch 'bug3959'
|
2016-12-05 11:03:51 +01:00 |
|
|
Axel Uhl
|
04e7aa684e
|
Merge branch 'master' into bug3924
|
2016-12-05 09:19:08 +01:00 |
|
|
Axel Uhl
|
07bc4a4c3f
|
Merge branch 'master' into bug3028
|
2016-12-05 09:10:20 +01:00 |
|
|
Axel Uhl
|
81c4a3d889
|
bug3980: showing all races in one fragment for protest time entry on smartphone/portrait
Change-Id: I1ee1f44d5e2ed46d5433ba601f7b3c96696324c9
|
2016-12-03 14:16:34 +01:00 |
|
|
Axel Uhl
|
3ad647c803
|
fixed constructor resolution after introducing type arguments for CheckinDataActivity
Change-Id: I06b96d4da615f09438ca772ab02bd32b695a4bf9
|
2016-12-02 16:49:09 +01:00 |
|
|
Peter Siegmund
|
05c7bbfe3c
|
add vectorDrawables for rcapp
|
2016-12-02 16:25:57 +01:00 |
|
|
Peter Siegmund
|
b012eea84c
|
fixed uniform flag
|
2016-12-02 16:24:37 +01:00 |
|
|
Peter Siegmund
|
de18f53854
|
add SWC flag resources
|
2016-12-02 16:24:07 +01:00 |
|
|
Axel Uhl
|
d0b53f6f1b
|
removed now redundant casts based on the introduction of generics for CheckinData
Change-Id: I380626162bf4bb78ec6a31a3c638334cb3cf3427
|
2016-12-02 15:52:55 +01:00 |
|
|
Axel Uhl
|
4988f7cae4
|
use generics to avoid casts for CheckinData vs. BaseCheckinData in shared android stuff
Change-Id: I248cb11ff5972b6bc55ac760ff1e37b49a9f599c
|
2016-12-02 15:40:26 +01:00 |
|
|
Axel Uhl
|
f0171e7bbf
|
Merge branch 'master' into bug3959
|
2016-12-02 15:10:34 +01:00 |
|
 fmittag
|
df98099ae6
|
fixed bug with missing Serializer/Deserializer for the regatta configuration of the new SWC start procedure.
Renamed SWCConfiguration to SWCStartConfiguration and the impl classes accordingly.
|
2016-12-01 12:49:16 +01:00 |
|
|
Peter Siegmund
|
5d2e347231
|
hide postpone flag for finishing/finished phase
|
2016-11-30 17:28:06 +01:00 |
|
|
Peter Siegmund
|
609b494710
|
sync mark position from server, if available
|
2016-11-30 14:25:51 +01:00 |
|
|
Peter Siegmund
|
1612e4d920
|
fixed spelling
|
2016-11-30 14:24:02 +01:00 |
|
|
fmittag
|
1f2acc1f90
|
Merge remote-tracking branch 'origin/bug3916'
|
2016-11-30 14:16:12 +01:00 |
|
|
Peter Siegmund
|
e9300713ce
|
fragment will be updated, if new marks are available
|
2016-11-30 12:10:28 +01:00 |
|
|
Axel Uhl
|
d51143f077
|
Merge branch 'master' into bug3916
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java
Change-Id: I679391487b85c85abdf8e100b72829b1947a2ff1
|
2016-11-29 18:06:38 +01:00 |
|
|
Axel Uhl
|
b7f72371da
|
Merge branch 'master' into bug3919
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html
Change-Id: I693b8bd6c24e293c5e7923ca8033ad6d1d13c208
|
2016-11-29 18:03:14 +01:00 |
|
|
Axel Uhl
|
ea2c6c67e7
|
renamed LineStartRacingProcedure and related types to ConfigurableStartModeFlagRacingProcedure
Change-Id: I5cef86cbb768c837db7fe5b5712f12d76c9d0b59
|
2016-11-29 16:13:01 +01:00 |
|
|
Peter Siegmund
|
ef806a0a48
|
add second to custom finish time (same as change finish time)
|
2016-11-29 11:23:15 +01:00 |
|
|
Peter Siegmund
|
f4f3d967ba
|
fixed protest duration editText textColor in dialog
|
2016-11-28 16:25:04 +01:00 |
|
|
Peter Siegmund
|
18e3062b30
|
show protest time range in race summary
|
2016-11-16 17:29:15 +01:00 |
|
|
Peter Siegmund
|
1f78ef3801
|
Merge branch 'bug3918' into bug3919
|
2016-11-16 17:00:26 +01:00 |
|
|
Peter Siegmund
|
0b2667491d
|
new input for protest time (start and duration)
|
2016-11-16 15:54:06 +01:00 |
|
|
Peter Siegmund
|
8fb8d3bf12
|
change protest time from start and duration to TimeRange (start/end)
|
2016-11-16 14:08:34 +01:00 |
|
|
Peter Siegmund
|
bccbebda9c
|
added missing LineStartRacingProcedure usage
|
2016-11-16 09:11:58 +01:00 |
|
|
Peter Siegmund
|
5ba4b43e12
|
use for RRS26 and SWC Racing Procedure the LineStart base class
|
2016-11-16 09:07:34 +01:00 |
|
|
fmittag
|
d9a95b8a31
|
refactoring of RRS26 and SWC racing procedure to share common functions through a shared LineStart racing procedure
|
2016-11-14 11:32:03 +01:00 |
|
|
Axel Uhl
|
26c21d9915
|
Merge branch 'master' into bug3916
|
2016-11-11 15:59:30 +01:00 |
|
|
Peter Siegmund
|
cf4958bfa1
|
add flag oscar resources
|
2016-11-10 19:46:49 +01:00 |
|
|
Peter Siegmund
|
6d6a419171
|
fixed blocking lint error
|
2016-11-10 19:46:20 +01:00 |
|
|
fmittag
|
d8c9a6f3e2
|
added placeholder for OSCAR flag
|
2016-11-10 14:09:18 +01:00 |
|
|
fmittag
|
daa1a07ef0
|
removed unused imports
|
2016-11-09 18:40:52 +01:00 |
|
|
Peter Siegmund
|
09c6f88f9f
|
removed unused Fragment
|
2016-11-08 22:53:44 +01:00 |
|
|
Peter Siegmund
|
0c11dfc6f0
|
StartModeFragment for RRS26 and SWC start modes
|
2016-11-08 22:53:25 +01:00 |
|
|
fmittag
|
6ed15d6d9d
|
added start mode selector for SWCRacingProcedure
|
2016-11-08 18:54:08 +01:00 |
|
|
Axel Uhl
|
c639685186
|
consolidated imports to avoid warnings
Change-Id: I17e3e47f6e2fb609937ce3dd8d7536670c107537
|
2016-11-07 17:59:04 +01:00 |
|
|
Peter Siegmund
|
3535f4fb40
|
add duration to RaceLogProtestStartTimeEvent
|
2016-11-07 17:11:04 +01:00 |
|
|
Peter Siegmund
|
f11560920f
|
protest time duration default as preference
|
2016-11-07 09:29:06 +01:00 |
|
|
Peter Siegmund
|
f4d8c66f16
|
show protest time in race summary (if available)
|
2016-11-07 09:02:22 +01:00 |
|
|
Peter Siegmund
|
00c7e06dc2
|
add SWC preferences into RCApp
|
2016-11-04 16:36:55 +01:00 |
|
|
Axel Uhl
|
d0232fe71e
|
fixed a few German translations in the race management app
Change-Id: I4d16f4aeeee2a0f7a9d77caedbb20e0e189eeb89
|
2016-10-20 10:41:52 +02:00 |
|
|
fmittag
|
fb7da86702
|
Merge remote-tracking branch 'origin/master' into bug3916
|
2016-10-19 14:24:55 +02:00 |
|
|
Axel Uhl
|
1595806cc0
|
make robust against old server versions that don't transmit GPS fix accuracy for buoy pinger app
Change-Id: Id74a180eb08481cd34142c83ad4bf1ce75c15bc9
|
2016-10-13 11:16:31 +02:00 |
|
|
Axel Uhl
|
f1f90ce32f
|
more formatting
Change-Id: I23705e2fa9a32a97504f3062eae8298a54d9de68
|
2016-10-13 10:51:26 +02:00 |
|
|
Axel Uhl
|
6a316d6743
|
formatting only
Change-Id: Ic4ce6ea8e820b23378967c6e2bd57673b7141623
|
2016-10-13 10:50:33 +02:00 |
|
|
Axel Uhl
|
2758a8bc6a
|
changed NOT_AVAILABLE_THROUGH_SERVER constant from type int to type double
Change-Id: I04a165876e72595bdda8f6c0c5d9eb9e7e97a2aa
|
2016-10-13 10:48:57 +02:00 |
|
|
Axel Uhl
|
2015c547ce
|
moved constant NOT_AVAILABLE_THROUGH_SERVER from MarkPingInfo to FlatGPSFixJsonSerializer where it can be used also by CheckinManager and MarkAdapter
Change-Id: Ic6b9a8842b394500b490134a7273ecf42a072ae0
|
2016-10-13 10:41:42 +02:00 |
|