Commit graph

53946 commits

Author SHA1 Message Date
enolp
2b6f386e1a Fix what Weblate screwed up 2019-03-15 21:25:11 +01:00
sonora
26daf55e17 string improvement 2019-03-15 20:45:07 +01:00
crimean
9756e119e9 Added total time/distance to PT card 2019-03-15 21:46:47 +03:00
Chumva
4259dea0fe remove unnecessary log 2019-03-15 19:14:54 +02:00
Chumva
cb23520a0a Fix min max values for steepness and improve ui 2019-03-15 19:12:50 +02:00
Victor Shcherb
e9febc4932 Merge branch 'master' into r3.3 2019-03-15 17:40:06 +01:00
Victor Shcherb
ce7f102dce Merge branch 'master' of github.com:osmandapp/Osmand 2019-03-15 17:39:53 +01:00
Victor Shcherb
a0b6e40c1f Merge branch 'r3.3' of github.com:osmandapp/Osmand into r3.3 2019-03-15 17:39:37 +01:00
Victor Shcherb
d2ab470e65 Fix critical issue with PT 2019-03-15 17:38:55 +01:00
crimean
c4563806e8 Merge branch 'r3.3' 2019-03-15 19:07:35 +03:00
crimean
b3551ac82b Merge branch 'r3.3' of https://github.com/osmandapp/Osmand into r3.3 2019-03-15 19:07:02 +03:00
crimean
6c542058b1 Fix PT details time 2019-03-15 19:06:51 +03:00
Denis Kolomiets
718c5d263f
Merge branch 'r3.3' into quickaction_fix_3.3 2019-03-15 18:04:10 +02:00
madwasp79
819e24b551 Change spaces to tabs 2019-03-15 18:00:57 +02:00
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
vshcherb
289b263802
Merge pull request #6690 from osmandapp/issue_6520
Issue #6520 Add warning dialog
2019-03-15 16:42:32 +01:00
madwasp79
09b46bb3bb Add warning dialog and prevent saving of POI edits if any of fields exceed OSM limit of 255 chars per tag. 2019-03-15 16:59:12 +02:00
Victor Shcherb
57febb8e7a Merge branch 'r3.3' 2019-03-15 14:41:36 +01:00
Victor Shcherb
bb509f9ab6 Try to speedup pt calculation 2019-03-15 14:41:13 +01:00
Victor Shcherb
50bdc0083d Fix empty routes 2019-03-15 14:41:12 +01:00
crimean
d6d45ac0fb Merge branch 'r3.3' 2019-03-15 15:57:29 +03:00
crimean
41edf4135f Disable buldle split for languages 2019-03-15 15:57:09 +03:00
Victor Shcherb
28b69de4ab Merge branch 'r3.3' 2019-03-15 13:50:10 +01:00
Victor Shcherb
682316fc0e Fix fields for transport route 2019-03-15 13:44:49 +01:00
Victor Shcherb
07f4898f59 Merge branch 'r3.3' 2019-03-15 13:31:18 +01:00
Victor Shcherb
bdd0424ca4 Fix crucial bug for public transport #6687 2019-03-15 13:31:01 +01:00
Denis Kolomiets
c5374a3d02
Merge branch 'r3.3' into quickaction_fix_3.3 2019-03-15 14:11:08 +02:00
crimean
4c146f8ad7 Merge branch 'r3.3' 2019-03-15 15:08:41 +03:00
crimean
a213298a6f Public transport fixes. Search crash fix. 2019-03-15 15:08:17 +03: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
97e20ae986 Merge branch 'master' of https://github.com/osmandapp/Osmand 2019-03-15 11:12:18 +03:00
crimean
3975904d2a Merge branch 'r3.3' 2019-03-15 11:12:09 +03: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
Hosted Weblate
048b3596fe
Merge branch 'origin/master' into Weblate. 2019-03-15 01:09:26 +01:00
iman
cccb1cfc99
Translated using Weblate (Persian)
Currently translated at 34.5% (1228 of 3560 strings)
2019-03-15 01:09:24 +01:00