 Peter Siegmund
|
8693de6be1
|
fixing Lint error because of new API in API 23 (Marshmallow)
|
2015-09-10 12:14:41 +02:00 |
|
|
Peter Siegmund
|
ab6225983a
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-09-10 10:38:52 +02:00 |
|
 Axel Uhl
|
ab955c0eac
|
removed project dependency of tracking app on com.sap.sailing.domain
|
2015-09-09 17:30:37 +02:00 |
|
|
Peter Siegmund
|
91a975baa7
|
Bug 3251 - RCApp constantly crashes when receiving updates
|
2015-09-01 10:47:28 +02:00 |
|
|
Peter Siegmund
|
def5fc943f
|
Merge branch 'master' into ubilabs--rcapp--master
|
2015-08-20 17:13:22 +02:00 |
|
|
Axel Uhl
|
b9ef73b9ad
|
Merge branch 'master' into bug3237
Conflicts:
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2015-08-18 16:49:27 +02:00 |
|
|
Axel Uhl
|
540361b129
|
on the way to a fix for bug 3237, introduced isMagnetic on RaceLogWindFixEvent; code currently doesn't compile; unclear where to obtain DeclinationService from
|
2015-08-18 15:19:54 +02:00 |
|
 Bennet Brunsen
|
58113ebc2c
|
Fixes gradle build issues
|
2015-08-18 14:04:55 +02:00 |
|
|
Bennet Brunsen
|
4233e33756
|
Deleted drag-sort-listview library
|
2015-08-18 12:25:41 +02:00 |
|
|
Bennet Brunsen
|
3a21889dc6
|
Merge branch 'ubilabs--tracking_app--bug_3223' into ubilabs--tracking_app--master
|
2015-08-17 15:26:41 +02:00 |
|
|
Bennet Brunsen
|
e0b9665247
|
Accept head requests
|
2015-08-17 11:06:30 +02:00 |
|
|
Axel Uhl
|
e72e59ee0c
|
removed commented code
|
2015-08-13 17:34:47 +02:00 |
|
|
Axel Uhl
|
0fbe9da733
|
Merge branch 'master' into ubilabs--tracking_app--master
|
2015-08-13 17:19:57 +02:00 |
|
|
Axel Uhl
|
edd86f0f74
|
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3204'
|
2015-08-13 15:41:24 +02:00 |
|
|
Bennet Brunsen
|
496a53b752
|
Removed warning
|
2015-08-13 15:12:45 +02:00 |
|
|
Bennet Brunsen
|
7547a315f7
|
Use target api instead of new api
|
2015-08-13 15:11:56 +02:00 |
|
|
Bennet Brunsen
|
e7f985eb38
|
Commented code resposible for tracking lock
|
2015-08-13 14:54:17 +02:00 |
|
|
Peter Siegmund
|
fab658450a
|
return also in By-Course (not 100% implemented, but if the setting is wrong)
|
2015-08-13 11:42:22 +02:00 |
|
|
Peter Siegmund
|
91a30b62ab
|
back from By-Marks Course Designer while race setup
|
2015-08-13 11:38:44 +02:00 |
|
|
Peter Siegmund
|
957fe53224
|
Bug 3204 - Lollipop protest time chooser
|
2015-08-13 11:21:29 +02:00 |
|
|
Bennet Brunsen
|
915e6b1b6f
|
Merge branch 'ubilabs--tracking_app--master' into ubilabs--tracking_app--develop
|
2015-08-13 10:40:15 +02:00 |
|
|
Axel Uhl
|
8ea379d678
|
aftermath for commit 022e83a979, bug 3217;
no need to escape device configuration identifier; it is already unescaped by the servlet
when receiving it
|
2015-08-13 05:41:20 +02:00 |
|
|
Axel Uhl
|
022e83a979
|
emergency fix for bug 3217: no longer escape parameters; they are passed to UrlHelper where they get escaped
|
2015-08-12 22:34:06 +02:00 |
|
|
Axel Uhl
|
beab5ecdb3
|
Merge branch 'ubilabs--rcapp--master'
Conflicts:
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java
|
2015-08-12 20:31:06 +02:00 |
|
|
Axel Uhl
|
6484bfa5fe
|
fixing warnings in LoginBackgrop
|
2015-08-12 20:28:20 +02:00 |
|
|
Peter Siegmund
|
4a5bc79cd4
|
Removed warning (sorry for the @SuppressWarnings("unchecked") in LoginBackdrop - it's because of the usage of reflection)
|
2015-08-12 20:12:36 +02:00 |
|
|
Bennet Brunsen
|
91cf5d7c73
|
Moved marker service start up to oncreate method
|
2015-08-12 18:03:03 +02:00 |
|
|
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 |
|