Bennet Brunsen
|
d125711e16
|
Disable login button in on resume
|
2016-04-14 15:19:50 +02:00 |
|
Axel Uhl
|
0b2f1f327f
|
removed obsolete comment
Change-Id: I7e148a560828c2d6b530f338798a8765551a676a
|
2016-04-14 11:13:32 +02:00 |
|
Axel Uhl
|
9f7277580b
|
renamed accessor method for mCourseAreaContainer
Change-Id: I9d8610d9f0c8dd0d8461bd3552ab81a0d909b907
|
2016-04-14 11:12:25 +02:00 |
|
Axel Uhl
|
4006732304
|
renamed course area-related field in Race Manager app's LoginListViews: mAreaContainer --> mCourseAreaContainer
Change-Id: Ie4c495e1ffb8907798c9ebefe1eb3a506582e2a2
|
2016-04-14 11:11:24 +02:00 |
|
Axel Uhl
|
24afb859f6
|
fixed field name in Race Manager app's LoginActivity: courseName --> courseAreaName
Change-Id: I80156bdbef120b6c70bdd18e8be14facbe4a4b82
|
2016-04-14 11:08:45 +02:00 |
|
Peter Siegmund
|
99ecc950cb
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-1267
|
2016-04-14 10:17:33 +02:00 |
|
Peter Siegmund
|
3dfe219137
|
set factor fragment
|
2016-04-14 10:16:14 +02:00 |
|
Axel Uhl
|
6e1865f0f7
|
Merge branch 'master' into ubilabs--rcapp--bug_3011
|
2016-04-14 10:11:35 +02:00 |
|
Peter Siegmund
|
9bc16bc182
|
Context has always to be the first param
|
2016-04-13 17:04:40 +02:00 |
|
Peter Siegmund
|
d3496f8d77
|
disabled checkForUpdate for non-sideloaded apps
|
2016-04-13 15:15:30 +02:00 |
|
Peter Siegmund
|
61089e2b83
|
load race column factors at login
|
2016-04-13 15:12:19 +02:00 |
|
Axel Uhl
|
362041877a
|
upgraded AndroidManifest.xml versions of apps
Change-Id: I1010248d7b6f78d905f3e695b832691982e71612
|
2016-04-13 14:59:33 +02:00 |
|
Axel Uhl
|
575d373a22
|
whitespace, formatting and commet changes; made one method private
Change-Id: Ibb102cec17f2f848f21235e18e66d58383990e98
|
2016-04-13 08:30:55 +02:00 |
|
Axel Uhl
|
babdcbe68c
|
Merge branch 'master' into ubilabs--rcapp--bug_3011
|
2016-04-12 12:44:53 +02:00 |
|
Peter Siegmund
|
8942bdf6fc
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-1267
|
2016-04-11 16:52:29 +02:00 |
|
Peter Siegmund
|
15312b6e60
|
remove wrong todo comment
|
2016-04-11 16:24:00 +02:00 |
|
Peter Siegmund
|
a81e458b9d
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-3570
|
2016-04-11 15:53:45 +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 |
|
Axel Uhl
|
d3b830d24b
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug_3011' into ubilabs--rcapp--bug_3011
|
2016-04-11 13:11:40 +02:00 |
|
Charlotte Proeller
|
40ce115009
|
bug: 3011: started changing the Filtering of race-rows
|
2016-04-11 12:13:57 +02:00 |
|
Axel Uhl
|
e33ad32ef9
|
Merge branch 'master' into ubilabs--rcapp--bug_3011
|
2016-04-11 11:08:18 +02:00 |
|
Peter Siegmund
|
9b73cb1444
|
null check for every competitor (including subdata)
|
2016-04-07 20:08:12 +02:00 |
|
Peter Siegmund
|
1a212eea44
|
remove races not available on the server after refresh
|
2016-04-07 19:37:51 +02:00 |
|
Peter Siegmund
|
431e0a92ff
|
Merge branch 'master' into ubilabs--rcapp--bug-3570
|
2016-04-07 16:55:36 +02:00 |
|
Peter Siegmund
|
20f15f272e
|
fixed "change role" (logout) memory leak of ManagedRaceImpl
|
2016-04-07 12:49:33 +02:00 |
|
Peter Siegmund
|
df25cb3ecc
|
switch to welcome screen, if current race isn't longer on the server
|
2016-04-07 11:44:45 +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 |
|
Axel Uhl
|
4d1232e283
|
Merge branch 'master' into ubilabs--rcapp--bug_3011
Conflicts:
build.gradle
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
Change-Id: Ic2f08b470d8ccf41e6e036da85689b29054652cc
|
2016-04-06 14:48:05 +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
|
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 |
|
Bennet Brunsen
|
0ea08a9cdc
|
Show subsequent race of scheduled race
|
2016-04-05 17:59:15 +02:00 |
|
Bennet Brunsen
|
4935c7d258
|
Prevent scheduled races and races in startphase from showing subsequent races
|
2016-04-05 17:43:45 +02:00 |
|
Bennet Brunsen
|
43a87c31ad
|
Remove header if series finished
|
2016-04-05 16:28:07 +02:00 |
|