 Axel Uhl
|
248f98895f
|
reverting import changes, again importing TimeUtils from racecommittee.app
Change-Id: Ic069b402d2c5bd63f8a6f2d83e2b7e8f2b9c85ab
|
2016-12-12 10:17:57 +01:00 |
|
|
Axel Uhl
|
9c49cfd0c2
|
consolidated imports to avoid warnings
Change-Id: I2c20a8a468861aa9b946ec6491d66e4d90b687e2
|
2016-12-12 09:56:25 +01:00 |
|
|
Axel Uhl
|
dfc516021a
|
Merge branch 'master' into bug3960
|
2016-12-12 08:48:54 +01:00 |
|
 Peter Siegmund
|
5c972d9ad6
|
Merge branch 'master' into bug3960
|
2016-12-09 12:00:01 +01:00 |
|
|
Peter Siegmund
|
26577cbfcd
|
RCApp specific TimeUtils
|
2016-12-09 10:23:33 +01:00 |
|
|
Axel Uhl
|
48402e3ec3
|
Merge branch 'master' into bug3827
|
2016-12-08 21:59:34 +01:00 |
|
|
Axel Uhl
|
6c24f0c2ed
|
fixing bug 3988 (force checkout from InSight)
Change-Id: I2caddbe2fbe30803481933590d8dd5279372674e
|
2016-12-08 21:58:40 +01:00 |
|
|
Axel Uhl
|
85aa0add16
|
tracking app (InSight): passing through the leaderboard display name instead of mangling it into the UrlData object
Change-Id: I4db0017dad78615d75597896694fdd8d77912c60
|
2016-12-08 20:31:59 +01:00 |
|
|
Axel Uhl
|
108180362a
|
fixing DB create statement; see bug 3827, comment #11
Change-Id: I0acde2bb63e737cfeb3a0a6efba3a2c0b32b6289
|
2016-12-08 17:02:02 +01:00 |
|
|
Axel Uhl
|
51688d8c28
|
after re-using the ContentValue object a clear() call seems missing
Change-Id: Ic347d2b2574d418acccdaea190db939e5f91963a
|
2016-12-08 16:56:23 +01:00 |
|
|
Axel Uhl
|
9b866c0304
|
added Javadoc for new display name field
Change-Id: I37f7199ad2b84dfa134c682d8bc10f1c5b966fcb
|
2016-12-08 16:23:18 +01:00 |
|
|
Axel Uhl
|
9a9e145a7c
|
added Javadoc
Change-Id: I1f8a11ebb0558168325af9fce4439923a11f1a45
|
2016-12-08 15:35:24 +01:00 |
|
|
Axel Uhl
|
fdb30c70e3
|
removed UrlData.leaderboardDisplayName; it is not part of the URL; passing it through as parameter explicitly
Change-Id: I2693de32b19388e5bcca627e786c2b7e826321fc
|
2016-12-08 15:32:34 +01:00 |
|
|
Axel Uhl
|
5947c0fc46
|
removed empty lines
Change-Id: Ie14b8ce70b77de19ece84cb26a9355a29df0ca1c
|
2016-12-08 15:02:36 +01:00 |
|
|
Axel Uhl
|
a5de4a1de6
|
Merge branch 'master' into bug3827
Conflicts:
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java
Change-Id: Iab9497cbca143517b33d47b6855464221bc6ac3d
|
2016-12-08 15:00:28 +01:00 |
|
|
Axel Uhl
|
f2358a1b3b
|
Merge branch 'master' into bug3960
Conflicts:
mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/TimeUtils.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MoreFlagsFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RaceSummaryFragment.java
Change-Id: I554dea918f9843e69666c3b9161df9162336cd7c
|
2016-12-07 13:31:28 +01:00 |
|
|
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 |
|
|
Peter Siegmund
|
d26d90bf33
|
styled license dialog (no white button)
|
2016-11-29 17:15:08 +01:00 |
|
|
Peter Siegmund
|
4d84a3b7a1
|
add leaderboard displayName into Buoy Pinger app
|
2016-11-29 16:41:51 +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
|
f6972c4bc0
|
removed unused imports
|
2016-11-29 10:16:30 +01:00 |
|
|
Peter Siegmund
|
513d1642af
|
notify listener, that data changed
|
2016-11-29 10:04:38 +01:00 |
|
|
Peter Siegmund
|
f229536f92
|
remove unused import
|
2016-11-28 16:57:28 +01:00 |
|
|
Peter Siegmund
|
295f35e23f
|
show displayName in toolbar
|
2016-11-28 16:54:18 +01:00 |
|
|
Peter Siegmund
|
26178a6a84
|
add displayName to leaderboards table
|
2016-11-28 16:48:02 +01:00 |
|
|
Peter Siegmund
|
f4f3d967ba
|
fixed protest duration editText textColor in dialog
|
2016-11-28 16:25:04 +01:00 |
|
|
Peter Siegmund
|
fcecf7501b
|
reset to “no gps” after 5 sec without any onLocationChanged call
|
2016-11-24 15:41:45 +01:00 |
|
|
Peter Siegmund
|
7553dcbcf1
|
usage of plural resources
|
2016-11-23 16:46:41 +01:00 |
|
|
Peter Siegmund
|
fa5d084800
|
fixed lint blocker
|
2016-11-23 15:02:17 +01:00 |
|
|
Peter Siegmund
|
9caf3b3725
|
move TimeUtils into shared
|
2016-11-23 15:01:55 +01:00 |
|