madwasp79
|
fc91c5582f
|
Merge remote-tracking branch 'origin/quickaction_fix_3.3' into quickaction_fix_3.3
# Conflicts:
# OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
|
2019-03-15 17:56:28 +02:00 |
|
madwasp79
|
df17a939ac
|
Change spaces to tabs
|
2019-03-15 17:52:55 +02:00 |
|
Denis Kolomiets
|
c5374a3d02
|
Merge branch 'r3.3' into quickaction_fix_3.3
|
2019-03-15 14:11:08 +02:00 |
|
madwasp79
|
2a88d48190
|
Class formatting cleanup (change spaces for tabs)
|
2019-03-15 14:05:46 +02:00 |
|
Victor Shcherb
|
84a2f5f923
|
Fix possible NPE
|
2019-03-15 13:03:51 +01:00 |
|
Victor Shcherb
|
d1694bf08c
|
Merge branch 'master' into r3.3
|
2019-03-15 11:56:20 +01:00 |
|
madwasp79
|
2a96932eeb
|
Merge remote-tracking branch 'origin/quickaction_fix_3.3' into quickaction_fix_3.3
# Conflicts:
# OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
|
2019-03-15 12:29:15 +02:00 |
|
madwasp79
|
03791f32a4
|
Quickaction mode fix
|
2019-03-15 12:28:25 +02:00 |
|
madwasp79
|
08d18358cc
|
Quickaction mode fix
|
2019-03-15 12:16:09 +02:00 |
|
crimean
|
256ae885b5
|
Fix PT walk bage click
|
2019-03-15 11:11:52 +03:00 |
|
madwasp79
|
d22fffd0e5
|
Merge remote-tracking branch 'origin/r3.3' into r3.3
|
2019-03-15 09:19:48 +02:00 |
|
madwasp79
|
f5285b3435
|
pr fixes #6222, #6140
(cherry picked from commit 83c7f833d7)
|
2019-03-15 09:18:16 +02:00 |
|
madwasp79
|
49ea1c418c
|
Issue #6187 - Tracks - Show on map button re-opens wrong sub-folder
(cherry picked from commit 231550951e)
|
2019-03-15 09:17:56 +02:00 |
|
madwasp79
|
f17358c405
|
Issue #6187 - Tracks - Show on map button re-opens wrong sub-folder
(cherry picked from commit 0d13a314a3)
|
2019-03-15 09:17:47 +02:00 |
|
madwasp79
|
7981e750f7
|
pull request fixes to Issue #6140 & #6222
(cherry picked from commit c0ba5bdcfd)
|
2019-03-15 09:17:39 +02:00 |
|
madwasp79
|
264a8d3d75
|
Issue #6140 - Saving snapped to route GPX track to new track - reworked
(cherry picked from commit 2165e84816)
|
2019-03-15 09:17:27 +02:00 |
|
Denis Kolomiets
|
450f005e5b
|
Update gradle.properties
(cherry picked from commit a224e9e696)
|
2019-03-15 09:17:19 +02:00 |
|
madwasp79
|
f83137f800
|
Issue #6140 - Saving snapped to route GPX track to new track - fixed
(cherry picked from commit 9fe525ae70)
|
2019-03-15 09:17:08 +02:00 |
|
madwasp79
|
d7decd2e4a
|
Issue #6222 - GPX track appearance doesn't update until Osmand closed and restarted, or screen is rotated - fixed
(cherry picked from commit 6223aa1a95)
|
2019-03-15 09:16:57 +02:00 |
|
crimean
|
635805475a
|
Merge branch 'r3.3' of https://github.com/osmandapp/Osmand into r3.3
|
2019-03-14 22:13:10 +03:00 |
|
crimean
|
fb2245e73c
|
Make PT bages clickable
|
2019-03-14 22:13:04 +03:00 |
|
Alexey
|
3b9b959e13
|
Merge pull request #6682 from osmandapp/RouteDetailsCustomColors
Add support for all custom rendering properties in route details
|
2019-03-14 19:41:24 +03:00 |
|
Chumva
|
96a2a87579
|
Add support for all custom rendering properties in route statistic
|
2019-03-14 18:32:54 +02:00 |
|
madwasp79
|
77cfcf6feb
|
Issue Fix - Quick Action: Incorrect position when creating "My places" point #6508
Day/Night mode QA refactoring.
|
2019-03-14 18:16:11 +02:00 |
|
Victor Shcherb
|
8441cc1cd9
|
Merge branch 'r3.3'
|
2019-03-14 16:35:33 +01:00 |
|
Victor Shcherb
|
2bf2694516
|
Avoid transport routes where walking is faster
|
2019-03-14 16:35:03 +01:00 |
|
Alexey
|
662dc8c8b9
|
Merge pull request #6661 from osmandapp/gpx_issues
Gpx issues #6222, #6140
|
2019-03-14 18:21:07 +03:00 |
|
madwasp79
|
83c7f833d7
|
pr fixes #6222, #6140
|
2019-03-14 17:18:59 +02:00 |
|
madwasp79
|
4542c1088b
|
Merge remote-tracking branch 'origin/gpx_issues' into gpx_issues
|
2019-03-14 17:13:41 +02:00 |
|
madwasp79
|
231550951e
|
Issue #6187 - Tracks - Show on map button re-opens wrong sub-folder
|
2019-03-14 17:13:28 +02:00 |
|
madwasp79
|
0d13a314a3
|
Issue #6187 - Tracks - Show on map button re-opens wrong sub-folder
|
2019-03-14 17:04:22 +02:00 |
|
madwasp79
|
c0ba5bdcfd
|
pull request fixes to Issue #6140 & #6222
|
2019-03-14 16:15:22 +02:00 |
|
vshcherb
|
5c9b68c54f
|
Merge pull request #6660 from francois2metz/fix_quick_action_location
Fix the resulting position when using a quick action.
|
2019-03-14 13:57:56 +01:00 |
|
alyonapinchuk
|
117c3a84c7
|
fixed the name of the distance unit
|
2019-03-14 13:55:29 +02:00 |
|
crimean
|
4b2531048e
|
Move ShowRouteInfoDialogFragment to routepreparationmenu
|
2019-03-14 14:34:59 +03:00 |
|
crimean
|
f4a96eb194
|
Move ShowRouteInfoDialogFragment to routepreparationmenu
|
2019-03-14 14:34:22 +03:00 |
|
Chumva
|
42079623b8
|
Merge branch 'RoutePreparationImprovements' of ssh://github.com/osmandapp/Osmand
|
2019-03-14 11:50:55 +02:00 |
|
Alexey
|
c22e97cfb8
|
Merge pull request #6677 from osmandapp/RoutePreparationImprovements
Route preparation warnings
|
2019-03-14 12:40:19 +03:00 |
|
Chumva
|
c2472e016a
|
Remove unnecessary changes
|
2019-03-14 11:38:14 +02:00 |
|
Chumva
|
3847d2f489
|
Remove unnecessary changes
|
2019-03-14 11:31:13 +02:00 |
|
Hosted Weblate
|
c724c287b3
|
Merge branch 'origin/master' into Weblate.
|
2019-03-13 18:38:50 +01:00 |
|
Ajeje Brazorf
|
11f5a7a67e
|
Translated using Weblate (Sardinian)
Currently translated at 99.7% (3550 of 3560 strings)
|
2019-03-13 18:38:48 +01:00 |
|
iman
|
b2f1956d44
|
Translated using Weblate (Persian)
Currently translated at 34.5% (1227 of 3560 strings)
|
2019-03-13 18:38:42 +01:00 |
|
Hinagiku Zeppeki
|
7e2b36030d
|
Translated using Weblate (Japanese)
Currently translated at 79.9% (2844 of 3560 strings)
|
2019-03-13 18:38:41 +01:00 |
|
Iván Seoane
|
ef85fc3aee
|
Translated using Weblate (Galician)
Currently translated at 100.0% (3560 of 3560 strings)
|
2019-03-13 18:38:30 +01:00 |
|
jan madsen
|
e40a28e671
|
Translated using Weblate (Danish)
Currently translated at 99.2% (3530 of 3560 strings)
|
2019-03-13 18:38:24 +01:00 |
|
Franco
|
b6bfd74951
|
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (2721 of 2721 strings)
|
2019-03-13 18:38:21 +01:00 |
|
Franco
|
8901a92536
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (2721 of 2721 strings)
|
2019-03-13 18:38:11 +01:00 |
|
Ajeje Brazorf
|
34e4c86ee7
|
Translated using Weblate (Sardinian)
Currently translated at 99.6% (2709 of 2721 strings)
|
2019-03-13 18:38:00 +01:00 |
|
Evgenii Martynenko
|
d20b15c7a8
|
Translated using Weblate (Russian)
Currently translated at 99.3% (2701 of 2721 strings)
|
2019-03-13 18:37:45 +01:00 |
|