Commit graph

67355 commits

Author SHA1 Message Date
Vitaliy
7636630f6d
Merge pull request #10348 from osmandapp/plan_route_config_profile
Plan route config profile
2020-12-07 09:47:51 +00:00
vshcherb
ff7a8bccbc
Merge pull request #10338 from osmandapp/fix_9918
Fix_9918
2020-12-07 10:45:01 +01:00
Dima-1
8c23d03ef5 Merge branch 'master' into plan_route_config_profile
# Conflicts:
#	OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
2020-12-07 11:44:18 +02:00
Dima-1
2b4862698b fix npe 2020-12-07 11:39:22 +02:00
Vitaliy
8e83e898d5
Merge pull request #10337 from osmandapp/buttom-sheet-fix
Buttom sheet fix
2020-12-07 09:36:11 +00:00
androiddevkkotlin
664e78ed50 check scrollable 2020-12-07 11:29:34 +02:00
androiddevkkotlin
4c69f346fc Remove usless 2020-12-07 11:04:25 +02:00
Vitaliy
246d5c2bd4
Merge pull request #10330 from osmandapp/Combine-use-elevation-data
Combine use elevation data
2020-12-07 08:43:28 +00:00
androiddevkkotlin
842c4b0f99 Refactor 2020-12-07 10:27:17 +02:00
Dima-1
7158e4fc71 Merge branch 'master' into plan_route_config_profile
# Conflicts:
#	OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
2020-12-07 10:17:34 +02:00
Dima-1
892ff7addb Plan route config profile 2020-12-07 10:11:10 +02:00
androiddevkkotlin
7dfa873e39 Refactor 2020-12-07 09:56:20 +02:00
xmd5a
7809be3f65 Add phrase 2020-12-07 10:21:29 +03:00
vshcherb
6b01261514
Merge pull request #10342 from aceman444/patch-1
Fix poi_motorcar_yes in phrases.xml
2020-12-07 00:11:06 +01:00
alex-osm
0864458a1e
Merge pull request #10326 from osmandapp/gpx_appearance
Remove default GPX color
2020-12-06 19:01:49 +03:00
Vitaliy
eb30f484df Fix compilation 2020-12-06 17:58:31 +02:00
Vitaliy
d8375b89e9 Merge branch 'master' into gpx_appearance
# Conflicts:
#	OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java
2020-12-06 17:56:24 +02:00
Vitaliy
e1856ef7ba Add setupBottomSheetItemForGpx 2020-12-06 17:55:32 +02:00
Vitaliy
ebbdb2d12f Add GpxSettingsItem 2020-12-06 17:29:04 +02:00
alex-osm
7eacac982a
Merge pull request #10344 from osmandapp/plugins_improvements
Combine connected app and plugin in UI and add plugin version to aidl
2020-12-06 17:56:17 +03:00
Vitaliy
2e5166b887 Combine connected app and plugin in UI and add plugin version 2020-12-06 16:36:11 +02:00
androiddevkkotlin
908d4d1127 addOnGlobalLayoutListener 2020-12-06 15:26:42 +02:00
max-klaus
e0189c904f Add new segment item at plan route options 2020-12-06 15:38:42 +03:00
max-klaus
86e32e5cc3 Fix plan route (reading saved route) 2020-12-06 14:48:15 +03:00
androiddevkkotlin
5782c0100d setShadowOnScrollableView 2020-12-06 13:22:23 +02:00
androiddevkkotlin
a7f2dd44d8 Merge branch 'master' into buttom-sheet-fix
# Conflicts:
#	OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java
#	OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
2020-12-06 11:06:57 +02:00
aceman444
8ec2a8e9ea
Fix poi_motorcar_yes in phrases.xml
The poi_motorcar_yes string is missing "yes" after colon, inconsistently to other access strings. I also checked that it is simply displayed as "Motorcar access:" in the app, without any yes/no/other value attached.
2020-12-06 01:30:07 +01:00
androiddevkkotlin
13795524f8 Directions > Options: Description elevation add 2020-12-06 00:43:51 +02:00
max-klaus
cbcf33146d Merge branch 'master' of github.com:osmandapp/Osmand 2020-12-05 19:54:05 +03:00
max-klaus
53de5bf80e Added split / join segments feature to plan route 2020-12-05 19:53:54 +03:00
androiddevkkotlin
a786ebdfe1 Shadow scroll fix 2020-12-04 17:40:56 +02:00
Vitaliy
c3bd5f024c
Merge pull request #10328 from osmandapp/fix_osm_editing
Fix osm editing
2020-12-04 15:30:48 +00:00
Dima-1
34e4ff33ae Refactoring 2020-12-04 17:27:27 +02:00
Vitaliy
5e693398b2 Fix #9918 2020-12-04 17:15:42 +02:00
androiddevkkotlin
1d09b6e9df GPX REC > Save
New ButtomSheet, new layout
2020-12-04 16:59:07 +02:00
vshcherb
c59d86681e
Merge pull request #10335 from osmandapp/fix_309
Fix map shifting on tap during map rotation
2020-12-04 16:49:22 +02:00
Vitaliy
4e7f8977e5 Fix map shifting during map rotation 2020-12-04 15:50:10 +02:00
androiddevkkotlin
d405a20c3e Refactor 2020-12-04 15:39:44 +02:00
Vitaliy
181661349e
Merge pull request #10333 from osmandapp/issue_295_obf_articles_search_by_name
Issue 295 TravelObfHelper articles search by name
2020-12-04 13:13:18 +00:00
simon
cb0593e2cd improvements 2020-12-04 15:12:28 +02:00
simon
c206cfc212 add sort and group filters 2020-12-04 14:59:40 +02:00
Hosted Weblate
cb1fefca75
Merge branch 'origin/master' into Weblate. 2020-12-04 13:29:36 +01:00
Sveinn í Felli
c014827629
Translated using Weblate (Icelandic)
Currently translated at 100.0% (271 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/is/
2020-12-04 13:29:33 +01:00
Jeff Huang
6dae42aa6a
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3863 of 3863 strings)
2020-12-04 13:29:33 +01:00
Sveinn í Felli
aa7ca41e28
Translated using Weblate (Icelandic)
Currently translated at 100.0% (3863 of 3863 strings)
2020-12-04 13:29:32 +01:00
Sveinn í Felli
cadc9817d3
Translated using Weblate (Icelandic)
Currently translated at 100.0% (3574 of 3574 strings)
2020-12-04 13:29:28 +01:00
Eduardo Addad de Oliveira
ab619cc308
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3863 of 3863 strings)
2020-12-04 13:29:26 +01:00
Franco
7c6e2f8000
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3863 of 3863 strings)
2020-12-04 13:29:25 +01:00
Babos Gábor
39faf643bd
Translated using Weblate (Hungarian)
Currently translated at 99.9% (3861 of 3863 strings)
2020-12-04 13:29:24 +01:00
Ajeje Brazorf
168cc838e2
Translated using Weblate (Sardinian)
Currently translated at 99.6% (3849 of 3863 strings)
2020-12-04 13:29:24 +01:00