Commit graph

68465 commits

Author SHA1 Message Date
Dima-1
df3c171a9c Merge branch 'master' into travel_obf_gpx_profile
# Conflicts:
#	OsmAnd/res/values/strings.xml
2021-02-04 10:53:31 +02:00
max-klaus
60e5763257 Merge branch 'r3.9' 2021-02-04 10:43:56 +03:00
max-klaus
4dc202dbc9 Fix mark / reset 2021-02-03 21:30:43 +03:00
max-klaus
894a36fed8 Fix OutOfMemory while uploading image to OPR 2021-02-03 21:17:18 +03:00
Vitaliy
9ef1ad13c5 Merge branch 'r3.9' 2021-02-03 18:39:07 +02:00
Vitaliy
1d2d5350ab Fix opr card update 2021-02-03 18:37:57 +02:00
Vitaliy
f1cff27d62
Merge pull request #10758 from osmandapp/plugin_fixes
Fix image cards in plugins
2021-02-03 16:31:08 +00:00
Vitaliy
7d96c9f536 Fix image cards in plugins 2021-02-03 18:26:53 +02:00
Victor Shcherb
aa065d7724 Merge branch 'r3.9' 2021-02-03 17:18:07 +01:00
Victor Shcherb
1027493abb Try to enable plugin by default 2021-02-03 17:14:45 +01:00
Victor Shcherb
2f464549b0 Clean up code 2021-02-03 17:09:29 +01:00
Victor Shcherb
ccf249cc35 Merge remote-tracking branch 'origin/r3.9' 2021-02-03 17:05:37 +01:00
Victor Shcherb
d687154bd5 Merge branch 'r3.9' 2021-02-03 17:05:21 +01:00
vshcherb
5c79c6aaef
Merge pull request #10757 from osmandapp/plugin_fixes
Enable OPR plugin by default
2021-02-03 17:03:30 +01:00
Victor Shcherb
0b92765f87 Sample photos before load 2021-02-03 17:03:03 +01:00
Victor Shcherb
0ebaff76e7 Sample photos before load 2021-02-03 17:02:39 +01:00
Vitaliy
3c73c44b2c Enable opr plugin by default 2021-02-03 18:00:09 +02:00
Victor Shcherb
2bad63f988 Merge branch 'r3.9' 2021-02-03 16:31:58 +01:00
Victor Shcherb
0f9673cd2e Update ipfs image 2021-02-03 16:31:15 +01:00
Victor Shcherb
946741933c Update ipfs image 2021-02-03 16:30:01 +01:00
Vitaliy
6cb16b1884 Merge branch 'r3.9' 2021-02-03 17:20:27 +02:00
alex-osm
7adaddd9a0
Merge pull request #10756 from osmandapp/mapillary_plugin
Mapillary plugin
2021-02-03 18:17:47 +03:00
Vitaliy
50e91af4da
Merge pull request #10755 from osmandapp/Missed-text-purchase
Missed text in UI
2021-02-03 15:16:58 +00:00
androiddevkotlin
18421f4b99 Min height, default visibility 2021-02-03 17:13:12 +02:00
Vitaliy
448c04dde9 Fix compilation 2021-02-03 16:57:57 +02:00
Vitaliy
a69b8b23d5 Merge branch 'r3.9' into mapillary_plugin
# Conflicts:
#	OsmAnd/src/net/osmand/plus/OsmandPlugin.java
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/ImageCard.java
#	OsmAnd/src/net/osmand/plus/openplacereviews/OpenPlaceReviewsPlugin.java
2021-02-03 16:52:50 +02:00
Dima-1
e9b02ae74b Renew activity icon 2021-02-03 16:52:24 +02:00
alex-osm
98fe1a0863
Merge pull request #10752 from osmandapp/opr_plugin
OPR plugin
2021-02-03 17:48:55 +03:00
Vitaliy
0514a49ba1 Rename methods 2021-02-03 16:47:31 +02:00
androiddevkotlin
169a9e6b95 Fix title text 2021-02-03 16:43:43 +02:00
Vitaliy
2a4818f630 Move IPFSImageCard to plugin 2021-02-03 16:40:24 +02:00
Vitaliy
4c38a5b73e Move mapillary images to plugin 2021-02-03 16:16:37 +02:00
Dmitry
5608f2de2a Added image for Mapillary plugin 2021-02-03 15:45:38 +02:00
Vitaliy
b30f651415 Move wiki image cards to plugin 2021-02-03 15:41:31 +02:00
Vitaliy
78c2dbbc1a Make mapillary plugin visible 2021-02-03 15:31:49 +02:00
androiddevkotlin
27fe223dd0 Missed text in UI
"Get" button in "Downloads.
OsmAnd Live screen after purchase.
2021-02-03 15:29:00 +02:00
max-klaus
457c90f945 Fix kmz reading 2021-02-03 16:10:46 +03:00
Vitaliy
9efab732f2 Merge branch 'r3.9' into opr_plugin
# Conflicts:
#	OsmAnd/src/net/osmand/plus/osmedit/oauth/OsmOAuthAuthorizationAdapter.java
2021-02-03 14:50:32 +02:00
Vitaliy
b8ae00f6c9 Add populateImageCards to osmand plugins 2021-02-03 14:46:33 +02:00
Vitaliy
5ea855ed61 UI fixes 2021-02-03 14:13:00 +02:00
Vitaliy
d63e21668f Show uploaded images in the context menu immediately after upload 2021-02-03 14:04:36 +02:00
max-klaus
47ee48f820 Merge branch 'r3.9' of github.com:osmandapp/Osmand into r3.9 2021-02-03 15:04:17 +03:00
max-klaus
2df09406e1 Fix npe 2021-02-03 15:04:07 +03:00
vshcherb
90d549dfe9
Merge pull request #10753 from osmandapp/small_fixes
Small fixes
2021-02-03 12:58:32 +01:00
Vitaliy
52a2ba0ca3 Open overview tab in half screen 2021-02-03 13:56:27 +02:00
Vitaliy
d614922a00 Merge remote-tracking branch 'origin/r3.9' into r3.9 2021-02-03 13:53:04 +02:00
Victor Shcherb
a09b0d518a Merge branch 'master' of github.com:osmandapp/Osmand 2021-02-03 12:47:10 +01:00
Victor Shcherb
b33a3b4dec Merge remote-tracking branch 'weblate/master' 2021-02-03 12:47:00 +01:00
max-klaus
70e8472c6b Added annotations 2021-02-03 14:44:21 +03:00
Victor Shcherb
c4448a5dd8 Merge remote-tracking branch 'origin/r3.9' 2021-02-03 12:42:55 +01:00