Commit graph

55977 commits

Author SHA1 Message Date
Dmitriy Prodchenko
9de6e53f02 Fix Avoid Road icon with new symbol 2019-07-22 14:17:09 +03:00
Dmitriy Prodchenko
2cfcb86aca Add icon for conditional 2019-07-22 14:11:16 +03:00
Victor Shcherb
1d58382138 Merge branch 'r3.4'
Conflicts:
	OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java
2019-07-22 13:09:05 +02:00
Victor Shcherb
804bc025bb Restore default vl 2019-07-22 13:08:12 +02:00
Victor Shcherb
dffbd49153 Fix issue with live maps 2019-07-22 12:59:16 +02:00
Victor Shcherb
62ad909a11 Fix issue with live maps 2019-07-22 12:58:49 +02:00
vshcherb
dfe3576cac
Merge pull request #7302 from osmandapp/conditionalRouting
Implement conditional restrictions
2019-07-22 12:04:03 +02:00
Victor Shcherb
c85a669ec8 Merge remote-tracking branch 'origin/conditionalRouting' 2019-07-22 11:54:51 +02:00
Chumva
f1c8c34bf3 Add time conditional routing setting to ui 2019-07-22 12:27:01 +03:00
Victor Shcherb
068f36a2ec Merge branch 'conditionalRouting' 2019-07-21 22:50:13 +02:00
Victor Shcherb
aea3cb9f3d Add java setting 2019-07-21 22:49:56 +02:00
Victor Shcherb
1f61cd49ab Fix compilation 2019-07-21 22:35:19 +02:00
Victor Shcherb
fce78cf8a5 Merge branch 'master' of github.com:osmandapp/Osmand 2019-07-21 22:34:11 +02:00
Victor Shcherb
6d7bb74874 Merge branch 'conditionalRouting' 2019-07-21 22:33:29 +02:00
Victor Shcherb
8e0c1524ee Fix npe 2019-07-21 21:29:43 +02:00
Victor Shcherb
5c6229f47b Fix native integration for conditional time 2019-07-21 21:25:57 +02:00
Victor Shcherb
6a39d99d4c Fix field for copy 2019-07-21 16:46:08 +02:00
Victor Shcherb
589ce11be2 Fix typo 2019-07-21 16:36:49 +02:00
Hosted Weblate
ffff6ee7a7
Merge branch 'origin/master' into Weblate. 2019-07-21 16:06:27 +02:00
Franco
4cd730cbf2
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (242 of 242 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/es_US/
2019-07-21 16:06:24 +02:00
Franco
0113fdf17d
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3587 of 3587 strings)
2019-07-21 16:06:24 +02:00
Roberto GEB
5c0b7c332a
Translated using Weblate (Spanish)
Currently translated at 100.0% (2905 of 2905 strings)
2019-07-21 16:06:22 +02:00
Zmicer Turok
f901a05fc6
Translated using Weblate (Belarusian)
Currently translated at 96.8% (2813 of 2905 strings)
2019-07-21 16:06:18 +02:00
IgorEliezer
24169bd372
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2905 of 2905 strings)
2019-07-21 16:06:07 +02:00
Victor Shcherb
718f79a9cd Adapt / prepare for text values for altitude 2019-07-21 15:40:09 +02:00
Victor Shcherb
5b9e711e2a Simplify tags 2019-07-21 15:12:42 +02:00
Victor Shcherb
918495b2ad Add conditional tags to geocoding 2019-07-21 14:09:04 +02:00
Victor Shcherb
446e991ca5 Implement conditional restrictions 2019-07-21 13:56:27 +02:00
Victor Shcherb
f2f84210e7 Implement conditional restrictions 2019-07-21 13:54:46 +02:00
Zmicer Turok
148b7e4b8e
Translated using Weblate (Belarusian)
Currently translated at 96.0% (2788 of 2905 strings)
2019-07-21 08:18:26 +02:00
Zmicer Turok
1685405d4f
Translated using Weblate (Belarusian)
Currently translated at 95.7% (2780 of 2905 strings)
2019-07-21 08:10:24 +02:00
Franco
7e7a5afe5b
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (2905 of 2905 strings)
2019-07-21 07:55:17 +02:00
WaldiS
e4e7dc2fae
Translated using Weblate (Polish)
Currently translated at 99.5% (2890 of 2905 strings)
2019-07-21 07:55:15 +02:00
ssantos
570cc18aae
Translated using Weblate (Portuguese)
Currently translated at 100.0% (2905 of 2905 strings)
2019-07-21 07:55:13 +02:00
Zmicer Turok
1457db3243
Translated using Weblate (Belarusian)
Currently translated at 95.1% (2762 of 2905 strings)
2019-07-21 07:55:03 +02:00
Verdulo
3304d59d23
Translated using Weblate (Esperanto)
Currently translated at 100.0% (2905 of 2905 strings)
2019-07-21 07:55:03 +02:00
Viktar Vauchkevich
ad4a353bd6
Translated using Weblate (Belarusian)
Currently translated at 95.1% (2762 of 2905 strings)
2019-07-21 07:54:59 +02:00
crimean
fca2f0dee3 Fix lat/lon images on widget 2019-07-20 17:00:04 +03:00
crimean
d009864901 Fix lat/lon images on widget 2019-07-20 16:59:29 +03:00
Chumva
7d96509d74 Remove unnecessary check for default color
(cherry picked from commit 58e02f14e6)
2019-07-20 14:48:22 +03:00
Chumva
02ace7b6b8 Remove unnecessary call to search for renderingAttributeRule
(cherry picked from commit 2b69d0908c)
2019-07-20 14:48:10 +03:00
Chumva
d8d4505e06 Add check for already selected gpx color
(cherry picked from commit a13367c0cc)
2019-07-20 14:47:57 +03:00
Chumva
550a2fb433 Add colors to live tracks and add group name to gpx file name
(cherry picked from commit 960a231201)
2019-07-20 14:47:42 +03:00
Chumva
0d770e4f8a Add live tracks via gpx aidl import
(cherry picked from commit 43797bae3c)
2019-07-20 14:47:27 +03:00
Chumva
e7bb115e29 Fix import gpx files to custom folders
(cherry picked from commit caac552822)
2019-07-20 14:47:06 +03:00
Chumva
0e965dd796 Fix live track auto update in UserGpxInfoFragment
(cherry picked from commit 1c4322ab0a)
2019-07-20 14:46:45 +03:00
Chumva
a33be76618 Remove unnecessary copy of GpxUtilities
(cherry picked from commit f2c63eeb2a)
2019-07-20 14:46:30 +03:00
Chumva
c2cf37113b Add auto map updates in UserGpxInfoFragment
(cherry picked from commit 44caece1d4)
2019-07-20 14:45:57 +03:00
Chumva
a5d77a0652 Live track settings initial commit
(cherry picked from commit d2e811d6e7)
2019-07-20 14:45:42 +03:00
Chumva
c649520490 Add timeline empty state and date control buttons
(cherry picked from commit 3788f5183c)
2019-07-20 14:45:21 +03:00