Vitaliy
d983d7d518
Merge remote-tracking branch 'origin/master' into import_export_data
2020-10-26 02:03:51 +02:00
Vitaliy
b4d776df8d
Merge pull request #10057 from osmandapp/Allow-the-same-name-favorites
...
Favorites: Allow to share the same name if favorites belong to differ…
2020-10-25 19:32:53 +02:00
Vitaliy
6db73c1aca
Merge branch 'master' into import_export_data
2020-10-25 19:22:12 +02:00
Vitaliy
e88ce2abd9
Export and import only visible global preferences
2020-10-25 19:16:40 +02:00
max-klaus
748fc78d4b
Fix build
2020-10-25 18:56:31 +03:00
max-klaus
80195f49db
Merge pull request #10074 from osmandapp/refactor_plan_route_approx
...
Refactor plan route approx
2020-10-25 18:47:10 +03:00
max-klaus
80f3101ba9
Merge branch 'master' into refactor_plan_route_approx
2020-10-25 18:46:31 +03:00
max-klaus
d97dfac152
Done except of (directions / reverse)
2020-10-25 18:33:40 +03:00
Vitaliy
8338c4bd7c
Merge branch 'master' into import_export_data
2020-10-25 15:52:17 +02:00
max-klaus
b1d714a62c
Gpx approx refactor (first stage)
2020-10-24 20:55:22 +03:00
Dima-1
ada0a8d300
Merge branch 'imp_exp_local_maps_offline' into imp_exp_osm_note
2020-10-23 15:30:37 +03:00
Dima-1
93458b41ca
Merge branch 'master' into imp_exp_osm_note
...
# Conflicts:
# OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java
# OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsItemType.java
2020-10-23 15:06:16 +03:00
Vitaliy
193e75c62d
Merge pull request #10015 from osmandapp/plugins_settings
...
Remove outdated plugin settings screens
2020-10-22 23:04:32 +03:00
Vitaliy
05b1eadf69
Merge branch 'master' into plugins_settings
...
# Conflicts:
# OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
2020-10-22 22:55:44 +03:00
max-klaus
181d0d048f
Merge pull request #10044 from osmandapp/import_export_data
...
Import export tracks and av notes
2020-10-22 19:35:07 +03:00
Vitaliy
77289a53aa
Fix file name for global export
2020-10-22 15:15:34 +03:00
Vitaliy
260adb89c1
Add global settings import
2020-10-22 13:32:28 +03:00
Dima-1
f146edc72c
Import/export offline maps
2020-10-22 11:29:41 +03:00
vshcherb
24c1cf1bc9
Merge pull request #10043 from eighthave/patch-1
...
support incoming content:// URIs pointing to OBF files
2020-10-21 20:07:09 +02:00
Vitaliy
46c5c04a01
Add global settings and multiple profiles export
2020-10-21 17:52:27 +03:00
androiddevkkotlin
50ff060486
Favorites: Allow to share the same name if favorites belong to different groups
2020-10-21 16:45:00 +03:00
Dima-1
3bee12f626
Merge branch 'master' into imp_exp_osm_note
2020-10-21 15:56:41 +03:00
Dima-1
d89d48474a
Import OSM Edit tags
2020-10-21 15:41:36 +03:00
Vitaliy
4272eaf93c
remove unnecessary changes
2020-10-21 11:43:17 +03:00
Vitaliy
257d27277b
remove unnecessary changes
2020-10-21 10:41:07 +03:00
Vitaliy
799d6481b6
remove unnecessary changes
2020-10-21 10:38:16 +03:00
Vitaliy
4f5f22fdc2
fix empty space
2020-10-21 10:34:11 +03:00
Vitaliy
d6bc456600
Remove outdated osm plugin activity
2020-10-21 01:25:01 +03:00
Vitaliy
433b2b8739
Add OAuth prefs to new osm plugin settings screen
2020-10-21 01:06:35 +03:00
Dima-1
1d6a0b39b7
Import OSM Edit
2020-10-20 18:48:41 +03:00
Vitaliy
9b3eeecf89
Remove outdated plugin settings screens
2020-10-20 14:59:57 +03:00
Vitaliy
3abbffa491
Fix profile button visibility for plugin settings
2020-10-20 14:39:55 +03:00
Vitaliy
7670733f38
Merge pull request #10045 from osmandapp/Favorites_duplication
...
Favorites duplication with same name
2020-10-20 04:26:34 +03:00
androiddevkkotlin
e21066eefe
Favorites duplication with same name
2020-10-19 22:15:00 +03:00
Dima-1
4021d38635
Import OSM Note
2020-10-19 18:36:13 +03:00
androiddevkkotlin
aecff42374
Method rename
2020-10-19 16:05:15 +03:00
Hans-Christoph Steiner
7e5d9b381b
support incoming content:// URIs pointing to OBF files
...
The whole "handle import" plumbing is already in place to handle both file:// and content:// URIs for OBF files. The `ObfImportTask` gets an `InputStream` from the `ContentResolver` already. `handleContentImport` defers to the `handleFileImport` for which helper to instantiate. Supporting content:// URIs here means this import can happen via `FileProvider` and other `ContentProvider` instances.
My use case is offline sharing of OBF files as handled by F-Droid Nearby Swap. Users can select which installed OBF files to share, then nearby users can connect to the device via Bluetooth or local WiFi to get the files.
2020-10-19 12:11:10 +00:00
Hardy
2af22671a9
remove accidental commit
2020-10-18 21:14:44 +02:00
Vitaliy
834080be31
Merge branch 'master' into plugins_settings
2020-10-18 22:09:38 +03:00
Hardy
8ef0ac74d3
Merge pull request #10039 from osmandapp/hardy_testing
...
update test branch
2020-10-18 21:07:17 +02:00
vshcherb
ffbf3477ba
Merge pull request #10038 from osmandapp/Category-names-poi
...
[bug] category names in user defined search converted to lowercase
2020-10-18 19:36:00 +02:00
Victor Shcherb
684f2b95d7
Fix java/C++ rendering rules property - should match types
2020-10-18 11:55:23 +02:00
androiddevkkotlin
63f06c3d39
[bug] category names in user defined search converted to lowercase
2020-10-18 12:52:16 +03:00
Victor Shcherb
0bc9008b9f
Change order
2020-10-18 02:37:52 +02:00
Victor Shcherb
07c297a95a
Fix parse complex properties
2020-10-18 02:28:44 +02:00
Victor Shcherb
28fdd139fb
Fix empty progress
2020-10-17 15:15:08 +02:00
xmd5a
146e97f3dc
Fix phrase (fix https://github.com/osmandapp/OsmAnd/issues/9992 )
2020-10-16 21:23:36 +03:00
Dima-1
d676cb3d55
Export OSM Note, OSM Edit
2020-10-16 19:21:03 +03:00
Victor Shcherb
3b892f875a
Merge
2020-10-16 14:44:26 +02:00
xmd5a
71401a2b25
Add phrases
2020-10-16 13:15:05 +03:00
