Commit Graph
978 Commits
Author SHA1 Message Date
Adrian Riedel 2319eb0670 Merge branch 'bug3861' of ssh://localhost:12349/home/trac/git 2016-08-15 10:30:04 +01:00
Axel Uhl 1ea0bc2f5d Merge branch 'bug3792' 2016-08-12 17:28:10 +02:00
Peter Siegmund d187e17fd4 InSight also needed GPS to work 2016-08-12 16:15:54 +02:00
Peter Siegmund 9255d8dd95 don't stop TrackingService after destroying the TrackingActivity 2016-08-12 11:39:35 +02:00
Peter Siegmund e8e38f3193 Merge branch 'master' into bug3803 2016-08-12 10:47:05 +02:00
Peter Siegmund 4e0972dd69 changed wording (fixes -> messages) 2016-08-12 08:45:02 +02:00
Axel Uhl a5c719c40b Merge branch 'master' into ubilabs--tracking_app--bug-3544 2016-08-11 13:51:36 +02:00
Axel Uhl 04057e07b0 Merge branch 'master' into ubilabs--tracking_app--bug-3547
Conflicts:
	mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml

Change-Id: Ia02a0311da5dec21183f471442ef3180491b68e8
2016-08-11 13:19:01 +02:00
Axel Uhl 8fd9f1b686 Merge branch 'master' into bug3795 2016-08-11 12:47:28 +02:00
Axel Uhl 67153cd77f Merge remote-tracking branch 'server/bug3846' 2016-08-11 11:20:35 +02:00
Axel Uhl 9d5a62b6d9 fixed preference description for GPS updates in "Sail InSight"
Change-Id: Ie0f657a8bc0acb601bb6e32defb0fd00b38aa2bd
2016-08-10 17:20:32 +02:00
Axel Uhl ce3f3597f8 whitespace changes only
Change-Id: Ic49bdcdb9b37524c98331b4a28d7496e88878432
2016-08-10 17:15:59 +02:00
Axel Uhl 6fc9d8f008 fixed adding of location to queue for bug 3803
Change-Id: Id48e1afa78226f1921af1aaf69c32152f8b0f1e3
2016-08-10 17:14:52 +02:00
Axel Uhl 0a189e4418 bug3803: queue Location objects and assemble JSON objects only when actually sending
Change-Id: I952aa84951ff3a30d85d351823e4dd5ac162b284
2016-08-10 11:37:45 +02:00
Axel Uhl e4348d16ba Merge branch 'master' into bug3803 2016-08-10 10:08:35 +02:00
Axel Uhl 3aef05ebc3 Merge branch 'master' into bug3846 2016-08-09 17:11:38 +02:00
Peter Siegmund ce3c45cb63 Merge branch 'master' into ubilabs--tracking_app--bug-3514 2016-07-31 10:59:28 +02:00
Peter Siegmund 89499eb339 remove android.permission.READ_PHONE_STATE 2016-07-31 10:46:36 +02:00
Steffen Tobias Wagner (D059727) 83756fb825 Merge branch 'master' into bug3832 2016-07-28 17:07:35 +01:00
Peter Siegmund 398e9f2fee forced line break 2016-07-28 17:59:37 +02:00
Peter Siegmund 03019517b0 fixed missing AlertDialog stylings 2016-07-28 11:00:08 +02:00
Peter Siegmund 0e582e5a63 add regatta list footer 2016-07-28 10:59:02 +02:00
Peter Siegmund 22c5085aac hide toolbar subtitle in leaderboard activity 2016-07-27 16:52:07 +02:00
Peter Siegmund 3b0e337aa9 concat fixes, if the sending is delayed, so you only have one request (per server) instead of at least 30 2016-07-27 16:00:41 +02:00
Peter Siegmund 142f9a201d optimized wording for start/stop tracking toast message 2016-07-27 10:56:15 +02:00
Peter Siegmund 14ad6df6dc change method visibility (public -> private) 2016-07-27 10:15:59 +02:00
Peter Siegmund 3d53639b99 fixed spelling 2016-07-27 10:15:04 +02:00
Peter Siegmund a8f42e829a remove "tools:ignore=MissingTranslation" to force translated strings or attribute "translatable=false" 2016-07-26 17:32:29 +02:00
Peter Siegmund 3a0bc44e7c fixed spelling 2016-07-26 16:38:59 +02:00
Peter Siegmund ffa728154a deleted unused string resources 2016-07-26 14:43:07 +02:00
Steffen Tobias Wagner (D059727) 12871a3fa3 improved english translations in android apps 2016-07-26 09:28:44 +02:00
Axel Uhl d794d05c9a fixing bug 3825 by using Uri.decode and Uri.encode consistently
Change-Id: I11e81fc43d70509d1b4ad21c90e17b810b31e505
2016-07-25 12:37:43 +02:00
Axel Uhl c74c636283 superficial patch for bug 3823: avoiding the NPEs
Change-Id: Idbaf764e875744f3a5598be6fb591c8f07965b52
2016-07-25 11:28:04 +02:00
Axel Uhl 3a60c0a947 fixed bug 3801 by introducing a send/buffer Timer that collects fix sending intents during the send interval
Change-Id: If78ef584dbdc718af665c8e2b671fbf1f1c57da3
2016-07-21 17:14:32 +02:00
Axel Uhl fb5931a2b5 fixing "KnKn" duplicate unit appending for SOG display in InSight app, fixing bug 3799
Change-Id: I8aaf738365bc7806b878ccdafb15366423f55a2e
2016-07-21 15:53:34 +02:00
Peter Siegmund f72069a005 Merge branch 'master' into bug3791 2016-07-19 17:30:38 +02:00
Peter Siegmund ee4e9cd68c fixed Tracking AlertDialogs 2016-07-19 13:51:01 +02:00
Peter Siegmund adc809d131 fixed EulaHelper AlertDialog 2016-07-19 13:28:05 +02:00
Peter Siegmund 19e4927b56 image file name is now competitor id, so it can be used across regattas 2016-07-19 13:03:18 +02:00
Peter Siegmund 68e66228fb added missing imports after merge 2016-07-19 12:44:23 +02:00
Peter Siegmund 7964665d6d Merge branch 'master' into ubilabs--tracking_app--bug-3769 2016-07-19 12:43:00 +02:00
Bennet Brunsen 304e2a476c Store team image for each competitor 2016-07-14 17:01:39 +02:00
Bennet Brunsen 9f1e1b44ea Fix bug in main list loader 2016-07-14 14:22:36 +02:00
Bennet Brunsen e17a1a0675 Display competitor, mark and leaderboard in main list 2016-07-14 14:22:36 +02:00
Bennet Brunsen cf835ade18 Prepare database to access mark name and competitor name for regatta list 2016-07-14 14:22:36 +02:00
Bennet Brunsen 5e33938068 Remove unused variable 2016-07-08 11:20:32 +02:00
Axel Uhl a85518a267 formatting only
Change-Id: I014716a2b4d5ea6c49279f43c4120b549595660a
2016-07-08 11:12:41 +02:00
Bennet Brunsen 333f10ddb3 Fixes no leaderboard and event information for mark tracking 2016-07-08 10:23:02 +02:00
Bennet Brunsen b3821e323f Start tracking from buoy fragment 2016-07-07 17:21:18 +02:00
Bennet Brunsen 86055a0d71 Fix encoding issue 2016-07-07 17:13:26 +02:00