Commit graph

55715 commits

Author SHA1 Message Date
crimean
6cdfc14432 Transport route menu fix 2019-07-10 15:53:21 +03:00
madwasp79
5277b156df Merge remote-tracking branch 'origin/master'
# Conflicts:
#	OsmAnd/res/values/strings.xml
2019-07-10 15:25:57 +03:00
madwasp79
03a6a26759 Merge branch 'r3.4' 2019-07-10 15:24:02 +03:00
Nazar
fd2bf300ea Merge remote-tracking branch 'origin/master' 2019-07-10 15:17:53 +03:00
Nazar
f1c590ec40 Merge branch 'r3.4' 2019-07-10 15:16:20 +03:00
Alexey
f15d5fa701
Merge pull request #7226 from osmandapp/settingsNavigationNoProfilesCrashFix
fix settings navigation profiles = 0 crash
2019-07-10 15:02:25 +03:00
Nazar
a4a07dad62 change onBackPressed() on finish() 2019-07-10 15:01:44 +03:00
Alexey
a0609c396a
Merge pull request #7227 from osmandapp/sett_theme_fix
text color fix for #7197
2019-07-10 15:01:17 +03:00
madwasp79
93267c6b03 fix for text color in settings for api 19 and below. 2019-07-10 14:54:21 +03:00
madwasp79
8b94760147 fix for text color in settings for api 19 and below. 2019-07-10 14:38:13 +03:00
Nazar
c5ae8a7373 fix settings navigation no profiles crash 2019-07-10 14:01:41 +03:00
vshcherb
386041950c
Merge pull request #7220 from osmandapp/collapsable_glitch
fix for context menu scroll glich
2019-07-10 11:46:51 +02:00
madwasp79
4fdcd2c3cb removed coordiantes from mapdatamenu 2019-07-10 12:38:26 +03:00
vshcherb
3029a0a346
Merge pull request #7223 from osmandapp/profile_string_fixes
string res fixes #7205
2019-07-10 11:10:07 +02:00
madwasp79
44045d677a string res fixes 2019-07-10 11:26:26 +03:00
xmd5a
ae98fc72c9 Add phrases 2019-07-10 11:11:26 +03:00
madwasp79
9d2538e936 code clean up 2019-07-10 10:19:38 +03:00
madwasp79
0f6f33c690 code clean up 2019-07-10 10:18:00 +03:00
madwasp79
765763e023 fix for context menu scroll glich 2019-07-10 10:04:19 +03:00
sonora
4c56d7f4ca string improvements 2019-07-10 00:28:55 +02:00
Victor Shcherb
6e1c784c68 Merge branch 'r3.4' 2019-07-10 00:23:28 +02:00
Victor Shcherb
8c4aac56f8 Disable live for public transport 2019-07-10 00:23:15 +02:00
sonora
83f28038cd string improvements 2019-07-10 00:19:04 +02:00
crimean
6a7b4fe8d5 Transport route/stop fixes 2019-07-09 21:30:13 +03:00
crimean
f277ac7ccf Transport route/stop fixes 2019-07-09 21:29:39 +03:00
crimean
3067c7b038 Move route name to shield 2019-07-09 20:42:33 +03:00
crimean
52bafbe535 Move route name to shield 2019-07-09 20:41:56 +03:00
vshcherb
8d4a8c4f84
Merge pull request #7215 from osmandapp/voiceMessageParams
extract add command code to method addToCommandList()
2019-07-09 17:47:43 +02:00
vshcherb
e8b4a3e03e
Merge pull request #7216 from osmandapp/voiceMessageParams
extract add command code to method addToCommandList()
2019-07-09 17:47:38 +02:00
Nazar
a5e1dc6d76 extract add command code to method addToCommandList() 2019-07-09 18:43:48 +03:00
Victor Shcherb
7dbbc4ff78 Merge remote-tracking branch 'origin/r3.4' 2019-07-09 17:36:52 +02:00
vshcherb
b8db6f6e19
Merge pull request #7212 from osmandapp/transportStopImprovements
Add check for referencesToRoutes
2019-07-09 17:36:30 +02:00
Chumva
f500c4597f Add check for referencesToRoutes 2019-07-09 18:20:48 +03:00
Victor Shcherb
266d65e87c Merge branch 'r3.4' 2019-07-09 17:20:19 +02:00
Victor Shcherb
177f2e6625 Fix js builder 2019-07-09 17:20:07 +02:00
vshcherb
c2f8e12576
Merge pull request #7210 from osmandapp/onVoiceRouterMessage
voice router message params
2019-07-09 17:17:15 +02:00
vshcherb
1ed55dc741
Merge pull request #7211 from osmandapp/transportStopImprovements
Fix local transport stop
2019-07-09 17:16:58 +02:00
Chumva
b6a22a663d Fix local transport stop 2019-07-09 17:44:11 +03:00
crimean
87033868ba Change public transport RP buttons 2019-07-09 17:26:22 +03:00
Nazar
99785140b2 voice router message params 2019-07-09 17:26:01 +03:00
crimean
6875334be7 Merge branch 'master' of https://github.com/osmandapp/Osmand 2019-07-09 17:22:48 +03:00
crimean
f5dbaea293 Change public transport RP buttons 2019-07-09 17:22:37 +03:00
vshcherb
b4e2b03917
Merge pull request #7208 from osmandapp/Fix_5937
Fix #5937
2019-07-09 16:10:27 +02:00
Chumva
900196975b Fix #5937 2019-07-09 16:35:17 +03:00
xmd5a
0cc94a3f70
Update strings.xml 2019-07-09 16:22:58 +03:00
xmd5a
40a7b5bba3
Update strings.xml 2019-07-09 16:22:14 +03:00
Victor Shcherb
410d62bd52 Merge remote-tracking branch 'origin/r3.4' 2019-07-09 15:01:47 +02:00
vshcherb
021ad48e8c
Merge pull request #7207 from osmandapp/360_deg_setting
360 deg setting
2019-07-09 15:01:26 +02:00
madwasp79
3efc5519ae add 360 degree setting
fixes for rounding azimuth results
2019-07-09 15:46:32 +03:00
Victor Shcherb
5d5df17f7c Merge branch 'r3.4' 2019-07-09 14:40:08 +02:00