 Axel Uhl
|
67a2c22acc
|
fixed NPE related to uninitialized tracking times
|
2015-08-12 16:00:49 +02:00 |
|
|
Axel Uhl
|
1cae206254
|
Merge branch 'ubilabs--tracking_app--develop'
Conflicts:
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
|
2015-08-12 15:32:49 +02:00 |
|
|
Axel Uhl
|
b173afc779
|
Merge branch 'ubilabs--rcapp--master'
|
2015-08-12 15:32:05 +02:00 |
|
|
Axel Uhl
|
822bb774f5
|
formatting only
|
2015-08-12 15:19:04 +02:00 |
|
 Bennet Brunsen
|
0b606b4656
|
Removed useless codein checkin manager
|
2015-08-12 14:40:01 +02:00 |
|
 Peter Siegmund
|
9dd5367d49
|
Bug 3205 - Font size in NavDrawer on Lollipop broken
|
2015-08-12 14:02:07 +02:00 |
|
|
Peter Siegmund
|
969d14b46c
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-12 13:49:56 +02:00 |
|
|
Peter Siegmund
|
07105c2005
|
ripples in popup menu (not working yet)
|
2015-08-12 13:27:23 +02:00 |
|
|
Peter Siegmund
|
83461cb120
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 10:53:55 +02:00 |
|
|
Peter Siegmund
|
dc1e1b8c54
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 10:53:48 +02:00 |
|
|
Peter Siegmund
|
0143d24e2c
|
fixed popup normal color
|
2015-08-12 10:34:53 +02:00 |
|
|
Bennet Brunsen
|
26646a5afc
|
Merge branch 'ubilabs--rcapp--feature--phone-login' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--feature--phone-login
|
2015-08-12 09:46:50 +02:00 |
|
|
Bennet Brunsen
|
ce52f3112a
|
Changed pop up menu style again to match light theme
|
2015-08-12 09:46:40 +02:00 |
|
|
Peter Siegmund
|
403378f2a6
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--feature--phone-login
|
2015-08-12 09:22:30 +02:00 |
|
|
Peter Siegmund
|
22a145b23e
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-08-12 09:22:15 +02:00 |
|
|
Peter Siegmund
|
95e0ad5d4d
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-08-12 09:21:57 +02:00 |
|
|
Peter Siegmund
|
d845bc3743
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-12 09:21:50 +02:00 |
|
|
Peter Siegmund
|
c4c91739e2
|
wrong comparison (&& instead of ||)
|
2015-08-12 09:20:41 +02:00 |
|
|
Axel Uhl
|
cd83623664
|
removed empty lines and redundant comments
|
2015-08-12 05:10:15 +02:00 |
|
|
Axel Uhl
|
c9bfe0e703
|
removed empty lines
|
2015-08-12 05:09:40 +02:00 |
|
|
Bennet Brunsen
|
2074dcd0a4
|
Merge branch 'ubilabs--rcapp--feature--phone-login' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--feature--phone-login
|
2015-08-11 17:55:25 +02:00 |
|
|
Bennet Brunsen
|
44f2b2a8be
|
Changed pop up menu style to match light theme
|
2015-08-11 17:47:29 +02:00 |
|
|
Peter Siegmund
|
16f8c6bed5
|
tablet portrait (login) is same as landscape - it's okay with that layout
|
2015-08-11 16:52:39 +02:00 |
|
|
Peter Siegmund
|
077042ac30
|
changed layout folder (from sw600dp to w900dp) for tablets
|
2015-08-11 16:34:02 +02:00 |
|
|
Peter Siegmund
|
8995fda313
|
login screen for phone layout (portrait) should be finished
|
2015-08-11 12:26:43 +02:00 |
|
|
Bennet Brunsen
|
a690c90fdb
|
Fixes configuration loader not working after screen rotation
|
2015-08-11 10:39:03 +02:00 |
|
|
Peter Siegmund
|
a7a7489e65
|
login screen for phone and tablet
|
2015-08-10 16:34:47 +02:00 |
|
|
Peter Siegmund
|
5c6ac976be
|
Merge branch 'ubilabs--rcapp--bug_3188' into ubilabs--rcapp--develop
|
2015-08-04 09:45:21 +02:00 |
|
|
Peter Siegmund
|
de8b23279c
|
Merge branch 'ubilabs--rcapp--bug_3150' into ubilabs--rcapp--develop
|
2015-08-04 09:45:04 +02:00 |
|
|
Peter Siegmund
|
1a83abc3a4
|
renamed ViewHolder into ViewHelper
|
2015-08-04 08:58:36 +02:00 |
|
|
Peter Siegmund
|
3572312382
|
refactored AppUtils
|
2015-08-04 08:56:39 +02:00 |
|
|
Peter Siegmund
|
48da623868
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-29 09:23:55 +02:00 |
|
|
Peter Siegmund
|
4df5d575d4
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-07-29 09:23:46 +02:00 |
|
|
Axel Uhl
|
03385b9bed
|
Merge branch 'master' into ubilabs--rcapp--bug_3188
|
2015-07-28 14:04:26 +02:00 |
|
|
Bennet Brunsen
|
5007e201fd
|
Fixes button color in main preference fragment
|
2015-07-27 17:25:41 +02:00 |
|
|
Axel Uhl
|
67bc73616c
|
Merge remote-tracking branch 'server/ubilabs--tracking_app--master'
|
2015-07-27 16:26:57 +02:00 |
|
|
Bennet Brunsen
|
0cfcbbfffc
|
Fixes text color for setting title label
|
2015-07-27 12:25:15 +02:00 |
|
|
Peter Siegmund
|
99fea4e443
|
only one view type for SpinnerAdapter
|
2015-07-24 09:00:28 +02:00 |
|
|
Peter Siegmund
|
83ed1cb3c8
|
fixed refactoring
|
2015-07-22 13:49:42 +02:00 |
|
|
Peter Siegmund
|
ab331b9995
|
used cached StartTimeFinderResult from ManagedRace
|
2015-07-22 13:11:05 +02:00 |
|
|
Peter Siegmund
|
3d57e88a4c
|
new background for spinner (drop box)
|
2015-07-22 13:09:00 +02:00 |
|
|
Peter Siegmund
|
6b3eed7279
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-07-22 10:38:52 +02:00 |
|
|
Axel Uhl
|
947299ddd7
|
keep forcing race state updates after loading races into RCApp until no more dependent start times can be resolved
|
2015-07-21 18:17:51 +02:00 |
|
|
Peter Siegmund
|
ea5c90fd15
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-21 16:01:01 +02:00 |
|
 wagnst
|
c72c5e2928
|
Merge branch 'ubilabs--rcapp--master'
|
2015-07-21 15:45:25 +02:00 |
|
|
Axel Uhl
|
343b55b2de
|
bug 3160: returning null for a race log when the race isn't found in the InMemoryDataStore
|
2015-07-21 15:12:53 +02:00 |
|
|
Peter Siegmund
|
041d2479a9
|
Merge branch 'ubilabs--rcapp--master' into ubilabs--rcapp--develop
|
2015-07-21 15:08:55 +02:00 |
|
|
Peter Siegmund
|
6430814827
|
removed unused method
|
2015-07-21 15:08:36 +02:00 |
|
|
Peter Siegmund
|
7b4c55c424
|
preselect current dependent race
|
2015-07-21 14:32:09 +02:00 |
|
|
wagnst
|
e9bbd041c4
|
Merge branch 'ubilabs--rcapp--master'
|
2015-07-20 23:16:16 +02:00 |
|