Axel Uhl
|
8b59b63ace
|
using SharedDomainFactory to deserialize marks in buoy pinging app
Change-Id: I1ad347f3e35cca1476603d46679977a08ecaaf93
|
2016-04-14 12:45:40 +02:00 |
|
Axel Uhl
|
972209066f
|
cleaned up CheckinManager constructors
Change-Id: I024db6ee02a3833ed5e0191999f73eea9d3c05d1
|
2016-04-14 12:32:42 +02:00 |
|
Axel Uhl
|
319033cbc2
|
formatting change
Change-Id: Ibd966673dd25530ac0495845a0f5f3a5778a6e3e
|
2016-04-14 11:05:05 +02:00 |
|
Axel Uhl
|
322ee489cf
|
added serialVersionUID in MarkInfo
Change-Id: I0d967249a38836d778e39b8a35655c6d776ace25
|
2016-04-14 11:02:38 +02:00 |
|
Axel Uhl
|
04fa3d5447
|
Merge branch 'master' into ubilabs--tracking_app--bugfix-constants
|
2016-04-14 10:57:33 +02:00 |
|
Axel Uhl
|
362041877a
|
upgraded AndroidManifest.xml versions of apps
Change-Id: I1010248d7b6f78d905f3e695b832691982e71612
|
2016-04-13 14:59:33 +02:00 |
|
Bennet Brunsen
|
a18df0e98d
|
Use GpsFix in MarkPingInfo
|
2016-04-12 17:00:11 +02:00 |
|
Bennet Brunsen
|
6301bcf35e
|
Deserialize marks with MarkJsonDeserializer
|
2016-04-12 16:38:29 +02:00 |
|
Steffen Tobias Wagner (D059727)
|
537abc5efb
|
Merge branch 'master' into ubilabs--tracking_app--bug-3527
|
2016-04-12 00:08:51 +02:00 |
|
Steffen Tobias Wagner (D059727)
|
7bd8662c95
|
changed Leaderboard string in InSights App
|
2016-04-11 23:39:26 +02:00 |
|
Peter Siegmund
|
68702f3776
|
AP flag has now correct shape
|
2016-04-11 15:36:47 +02:00 |
|
Peter Siegmund
|
b97db4b10b
|
switch from ArrayList to SynchronizedList because of the async loader
|
2016-04-11 14:47:50 +02:00 |
|
Bennet Brunsen
|
10af03edeb
|
Use app constants for mark in checkin manager
|
2016-04-08 12:53:48 +02:00 |
|
Bennet Brunsen
|
c01c97c28e
|
Deserialize mark pings with FlatGPSFixJsonDeserializer
|
2016-04-08 12:23:40 +02:00 |
|
Bennet Brunsen
|
63c6541825
|
Small cleanups
|
2016-04-08 10:00:12 +02:00 |
|
Peter Siegmund
|
9b73cb1444
|
null check for every competitor (including subdata)
|
2016-04-07 20:08:12 +02:00 |
|
Bennet Brunsen
|
a1c0439e1c
|
Fixes text issue with scrolling in about fragment
|
2016-04-07 14:21:16 +02:00 |
|
Axel Uhl
|
1134841848
|
fixed merge issues related to DeviceConfigurationDetails class introduction
Change-Id: Ia48d0b17a7f710a4bcd29bd83c43cf1c766de532
|
2016-04-07 08:40:43 +02:00 |
|
Axel Uhl
|
0d4b6f0b06
|
Merge branch 'master' into ubilabs--rcapp--bug-3481
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginOnboarding.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
Change-Id: Ica8a65729f2873480fd20d4ef818295ad5bd9993
|
2016-04-07 01:37:50 +02:00 |
|
Axel Uhl
|
26ff2a5343
|
Merge branch 'bug3556' of ssh://localhost:12347/home/trac/git into bug3556
|
2016-04-06 23:33:52 +02:00 |
|
Axel Uhl
|
a6979dc343
|
Merge branch 'master' into bug3556
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
Change-Id: I5de0b021ea379792fc0d6f81797adc487ba23bee
|
2016-04-06 23:20:45 +02:00 |
|
Peter Siegmund
|
3f07074e54
|
fixed NPE for getRaceState
|
2016-04-06 23:17:21 +02:00 |
|
Peter Siegmund
|
929a7910da
|
added german translation
|
2016-04-06 23:04:15 +02:00 |
|
Peter Siegmund
|
74964f81e4
|
return to main screen, even if the current race isn't abandoned
|
2016-04-06 21:29:00 +02:00 |
|
Peter Siegmund
|
7ec51a6ad5
|
don't show "set signal" for NOVEMBER flag
|
2016-04-06 21:12:26 +02:00 |
|
Peter Siegmund
|
e444a80b3a
|
show full name of race
|
2016-04-06 20:52:59 +02:00 |
|
Axel Uhl
|
272f77838b
|
consolidated imports
Change-Id: Ib28b264b627fb9272d1267680b114e6674a3e432
|
2016-04-06 18:53:33 +02:00 |
|
Axel Uhl
|
4b4d9780ec
|
added missing abort of race if it doesn't depend on anything
Change-Id: I4ce4d3aab9bb64b2a784131644612ae36a985ca3
|
2016-04-06 18:43:06 +02:00 |
|
Axel Uhl
|
2db28920d9
|
collect actions for race abortion in first pass; execute them in second pass
Change-Id: I6e85536b5635af75b879779af0f52416ed829605
|
2016-04-06 18:23:47 +02:00 |
|
Axel Uhl
|
77698101bd
|
untested, experimental update to abortRunningRaces
Change-Id: Iac7c757ab866b6036df3bf562e813025e542e636
|
2016-04-06 16:39:37 +02:00 |
|
Axel Uhl
|
30e811f7e9
|
renamed StartTimeFinderResult.dependingOnRaces
Change-Id: Id5746bba4ead50dc23e23c1c2350a11843419bf5
|
2016-04-06 16:02:43 +02:00 |
|
Axel Uhl
|
232a8a162a
|
Merge branch 'master' into ubilabs--rcapp--bug-3148
Conflicts:
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
Change-Id: Ibb0d709e9e6c39e915faf2cf568f4ea85853993f
|
2016-04-06 15:05:27 +02:00 |
|
Peter Siegmund
|
f77ed4e89e
|
show "running" races instead of dependent races in race selection and abort the correct races
|
2016-04-06 14:45:07 +02:00 |
|
Axel Uhl
|
5fb1eed3c1
|
removed obsolete comment
Change-Id: I521f052b08f555fa1df199b8e06ade6f3e9eca3c
|
2016-04-06 14:21:44 +02:00 |
|
Axel Uhl
|
fb7f615a88
|
URL-encode the competitorId parameter so as to allow competitor names that contain what is a special character for a path-encoded param
Change-Id: Ibd437ce57c8d7612a91d8b0944e20be168e20c9f
|
2016-04-06 14:20:49 +02:00 |
|
Axel Uhl
|
eab00350a5
|
moved race result enabling from AppPreferences to regatta-specific, racing procedure type-specific preference
Change-Id: I3400cd868528388bd741e1798a58c820903ea665
|
2016-04-05 20:54:46 +02:00 |
|
Axel Uhl
|
42b691d903
|
minor code simplification
Change-Id: I4dd7e6dadd51755b60ee30b8c5e391dd666b2954
|
2016-04-05 18:13:48 +02:00 |
|
Axel Uhl
|
a900b37632
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2016-04-05 18:09:12 +02:00 |
|
Axel Uhl
|
e79441408f
|
fixed BitmapHelper import after merge
Change-Id: I19152ff089e33357112ac74920ef6f656f676820
|
2016-04-05 15:57:16 +02:00 |
|
Axel Uhl
|
b35dc6cd10
|
Merge branch 'master' into ubilabs--tracking_app--develop--bugfix-3567-outofmemoryerror
Conflicts:
mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BitmapHelper.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
Change-Id: I33297ab89503941afd868cf396eae7309daced25
|
2016-04-05 15:43:33 +02:00 |
|
Teresa Holfeld
|
667931a3f1
|
Set image after width and height calculation have been done
|
2016-04-05 14:59:48 +02:00 |
|
Steffen Tobias Wagner (D059727)
|
8bfaa07334
|
Merge branch 'master' into ubilabs--rcapp--bug-3555
|
2016-04-05 12:58:44 +02:00 |
|
Peter Siegmund
|
b497f6ef83
|
change setting title
|
2016-04-05 12:44:08 +02:00 |
|
Teresa Holfeld
|
7a573fd7a4
|
Delete old BitmapHelper, use new BitmapHelper instead
|
2016-04-05 12:34:23 +02:00 |
|
Teresa Holfeld
|
21317cef6f
|
Use new BitmapHelper to decode Bitmap and downsample image to required size
|
2016-04-05 12:18:52 +02:00 |
|
Peter Siegmund
|
95a46a2969
|
hide race list editing from race summary screen (if not allowed in setting)
|
2016-04-05 11:34:22 +02:00 |
|
Peter Siegmund
|
acb1da80fd
|
show race result list while finishing phase, if activated in preferences - default: false
|
2016-04-05 11:15:01 +02:00 |
|
Peter Siegmund
|
024a2ebf20
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2016-04-05 10:03:52 +02:00 |
|
Peter Siegmund
|
ac604fa9b4
|
added build.info to gitignore
|
2016-04-05 09:59:12 +02:00 |
|
Peter Siegmund
|
7f8405326c
|
revert build.info
|
2016-04-05 09:55:05 +02:00 |
|