Commit graph

68285 commits

Author SHA1 Message Date
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
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
vshcherb
f56f0d971a
Merge pull request #10751 from osmandapp/minor_fixes
Minor fixes
2021-02-03 12:42:22 +01:00
Vitaliy
0083b7d0e1 Fix possible npe with general router 2021-02-03 13:40:58 +02:00
Vitaliy
d6b1f24b55 Add CheckOprAuthTask 2021-02-03 13:33:20 +02:00
Vitaliy
fd8afa15b3 Add ability to switch to dev server 2021-02-03 13:24:20 +02:00
Vitaliy
43f326e320 Add OpenPlaceReviewsPlugin 2021-02-03 13:22:20 +02:00
Vitaliy
3fa52bf005 Rename osm preferences 2021-02-03 13:07:34 +02:00
Dmitry
2ef2ba43d6 Added image for OpenPlaceReviews plugins screen
(cherry picked from commit 24c69f0a87)
2021-02-03 12:58:23 +02:00
Vitaliy
b770a61c31 Merge branch 'r3.9' 2021-02-03 12:44:33 +02:00
Hosted Weblate
503e501fdf
Merge branch 'origin/master' into Weblate. 2021-02-03 11:42:23 +01:00
Steve Lee
6b92f064ec
Translated using Weblate (Chinese (Simplified))
Currently translated at 67.7% (2476 of 3656 strings)
2021-02-03 11:42:18 +01:00
Vitaliy
638489fcdf Fix possible npe after new wpt point was added 2021-02-03 12:30:54 +02:00
Vitaliy
95cc20b022 Add check for available oauth request token 2021-02-03 11:52:51 +02:00
Vitaliy
6dcde54ace Fix check for default profile 2021-02-03 11:41:56 +02:00
Vitaliy
6a38b44e5f Fix possible npe 2021-02-02 23:25:45 +02:00
Vitaliy
d0758f4146 Fix possible npe 2021-02-02 22:25:17 +02:00
vshcherb
837b29401c
Merge pull request #10737 from osmandapp/fix_piste_type
Fix piste type
2021-02-02 20:55:44 +01:00
Vitaliy
53d30621cd
Merge pull request #10747 from osmandapp/add_default_profile_name2
Add default name for imported profiles
2021-02-02 15:43:36 +00:00
nnngrach
e57404470d add default profile name for unnamed or missing improted profiles. 2021-02-02 18:40:12 +03:00
Victor Shcherb
bb9a057665 Add route activity type class 2021-02-02 15:40:48 +01:00
Vitaliy
52bc6c02e7
Merge pull request #10743 from osmandapp/fix_big_transaction
Fix #10540 TransactionTooLargeException
2021-02-02 14:37:13 +00:00
cepprice
31d31f1023 Small edit 2021-02-02 18:41:11 +05:00