Commit Graph
34457 Commits
Author SHA1 Message Date
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
Riedel 2c6eaaca2d Merge branch 'master' of ssh://localhost:12349/home/trac/git 2016-08-11 14:02:59 +01:00
Axel Uhl 54313dc6cf Merge remote-tracking branch 'server/master' 2016-08-11 14:37:00 +02:00
Riedel 2996e7569b initial 2016-08-11 13:31:02 +01:00
Axel Uhl 009ff5a34b Merge branch 'master' into ubilabs--tracking_app--bug-3546 2016-08-11 14:08:07 +02:00
Benjamin Barth d6627c652a Merge branch 'bug3859' 2016-08-11 13:52:39 +02:00
Axel Uhl a5c719c40b Merge branch 'master' into ubilabs--tracking_app--bug-3544 2016-08-11 13:51:36 +02:00
Benjamin Barth 69c6635c03 bug3859 "Downgraded" onboarding wiki page to Eclipse Mars SR2 (4.5.2) 2016-08-11 13:35:41 +02:00
Benjamin Barth cccb02f2a2 bug3859 Added comment tycho version in pom.xml to be aware of ECJ/JDT
bug
2016-08-11 13:34:17 +02:00
Benjamin Barth fd8d49edc7 bug3859 Fixed script for automatic plugin installation for Mars SR2 2016-08-11 13:31:42 +02:00
Axel Uhl c53c5811b1 Merge branch 'master' into ubilabs--tracking_app--bug-3547 2016-08-11 13:19:55 +02:00
Axel Uhl 44c81eb8ed added pairing list generator's Matlab sources and C library export
Change-Id: Ie9d2f798c81c81acea39e2bd5c3f9e2302ff6211
2016-08-11 13:19:26 +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
Riedel 7c8b45ce24 Merge branch 'master' of ssh://localhost:12349/home/trac/git 2016-08-11 12:02:48 +01:00
Axel Uhl 8fd9f1b686 Merge branch 'master' into bug3795 2016-08-11 12:47:28 +02:00
Riedel 0883a0e2c0 Merge branch 'bug3792' of ssh://sapsailing.com/home/trac/git 2016-08-11 10:49:46 +01:00
Axel Uhl 67153cd77f Merge remote-tracking branch 'server/bug3846' 2016-08-11 11:20:35 +02:00
Benjamin Barth 82000bb31e Merge branch 'master' into bug3859 2016-08-11 10:52:24 +02:00
Benjamin Barth 93ae98fcf6 Merge branch 'bug3855' 2016-08-11 10:45:20 +02:00
Benjamin Barth c4cd0b3480 Fixed typo in plugin installation script for Eclipse Neon 2016-08-11 10:14:11 +02:00
Benjamin Barth f22796098d Add script for automatic plugin installation for Eclipse Mars SR2 2016-08-11 10:13:58 +02:00
Vladislav Chumak 38a9578f3f Corrected removeBusyTask() calls to consider showProgress flag 2016-08-11 09:50:27 +02:00
Adrian Riedel dbccc7d481 Updated Smartphone Tracking (markdown) 2016-08-11 07:43:51 +00:00
Adrian Riedel e7eb3e9304 Updated Smartphone Tracking (markdown) 2016-08-11 07:34:21 +00:00
Adrian Riedel f424eed737 Updated Smartphone Tracking (markdown) 2016-08-11 07:33:25 +00:00
Axel Uhl 91c2cf70da use addBusyTask/removeBusyTask in loadCompleteLeaderboard depending on showProgress parameter; use try/finally for removeBusyTask where needed
Change-Id: If3990ed3abe477f7a9d2995ca07282b4d232a2bb
2016-08-10 18:26:35 +02:00
Axel Uhl 7e1ed8e0f0 Merge branch 'master' into bug3855 2016-08-10 18:23:01 +02:00
Axel Uhl 0395a5fb35 Merge remote-tracking branch 'server/master' 2016-08-10 18:22:37 +02:00
Adrian Riedel 44aa0770bc Updated Smartphone Tracking (markdown) 2016-08-10 15:39:27 +00:00
Vladislav Chumak d92f026476 Removed unused method parameter and corrected execution path 2016-08-10 17:31:08 +02:00
Adrian Riedel 9cbbb2bf7e Created smartphone tracking (markdown) 2016-08-10 15:26:18 +00:00
Axel Uhl 33423f386d Merge remote-tracking branch 'server/master' 2016-08-10 17:22:04 +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
Steffen Schaefer fa52f05e47 Added an explanatory comment to a test case 2016-08-10 17:12:49 +02:00
Adrian Riedel ccad472992 Updated home (markdown) 2016-08-10 14:59:37 +00:00
Adrian Riedel d01a88286e Renamed theses to thesis 2016-08-10 14:59:08 +00:00
Adrian Riedel 1333ff4e98 Updated home (markdown) 2016-08-10 14:58:50 +00:00
Adrian Riedel 8623f776ec Updated home (markdown) 2016-08-10 14:58:18 +00:00
Steffen Schaefer 34c75d06d7 Added stripped down test case that fails on Eclipse Neon 2016-08-10 16:45:04 +02:00
Benjamin Barth b799585472 Merge branch 'bug3709' 2016-08-10 11:40:00 +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
Benjamin Barth 228c1b3cd2 bug3858 Fixed construction of mail verification link if locale parameter
is present
2016-08-10 11:30:26 +02:00
Benjamin Barth beb61ffb4e bug3709 Remove another code duplication in navigator implementations 2016-08-10 10:31:47 +02:00
Benjamin Barth 2efcf7a6d6 Merge branch 'improvements2016' into master 2016-08-10 10:20:14 +02:00
Axel Uhl e4348d16ba Merge branch 'master' into bug3803 2016-08-10 10:08:35 +02:00
Axel Uhl 76f1bc5421 Merge branch 'master' into bug3765 2016-08-10 09:53:51 +02:00