Commit graph

68215 commits

Author SHA1 Message Date
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
Dima-1
0672f140af Check resource 2021-02-03 11:24:22 +02:00
Dima-1
055c681f4b Add activity types 2021-02-02 23:34:57 +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
Dima-1
7f678334c2 Merge branch 'master' into travel_obf_gpx_profile 2021-02-02 17:05:05 +02: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
vshcherb
3beb39976d
Merge pull request #10745 from osmandapp/fix_speed_unit_minsec
fix speed unit setting for "min/km" to show seconds instead of fracti…
2021-02-02 14:07:19 +01:00
Skalii
9c08af0ecb fix speed unit setting for "min/km" to show seconds instead of fractional minutes 2021-02-02 14:55:41 +02:00
Victor Shcherb
bae82d8b70 clean up setup files 2021-02-02 13:43:45 +01:00
Vitaliy
2b3c71c612
Merge pull request #10744 from osmandapp/toggle-fix
toggle hilshade fix
2021-02-02 14:18:39 +02:00
androiddevkotlin
bc63b01ad2 toggle hilshade fix 2021-02-02 14:15:42 +02:00
cepprice
ac11686646 Fix #10540 2021-02-02 16:52:35 +05:00
Vitaliy
f6fd2fbb73
Merge pull request #10738 from osmandapp/togglefix
hillshade/terrain toggle fix
2021-02-02 13:36:56 +02:00
androiddevkotlin
a0d57b39cf hillshade/terrain toggle fix 2021-02-02 13:28:19 +02:00
Vitaliy
6629594537 Merge branch 'r3.9' 2021-02-02 12:49:04 +02:00
Vitaliy
dedea0c45e
Merge pull request #10731 from osmandapp/DataStorageRefactoring
Data storage refactoring
2021-02-02 12:47:16 +02:00
nazar-kutz
6340f65290 small fix 2021-02-02 12:42:40 +02:00
Vitaliy
6e277c4a64 Merge branch 'r3.9' 2021-02-02 12:06:53 +02:00
Vitaliy
f09ae5c894
Merge pull request #10728 from osmandapp/OnlineRoutingRefactoring
refactor server wrong response checking
2021-02-02 12:06:16 +02:00
Vitaliy
e846f318ef Merge branch 'weblate'
# Conflicts:
#	OsmAnd/res/values-de/strings.xml
2021-02-02 11:57:07 +02:00
nazar-kutz
1030bc67cb Fix #10665 Slope and Hillshade maps separated in the OsmAnd storage overview 2021-02-02 10:29:14 +02:00
nazar-kutz
bba9ed1f26 Improve calculation algorithm of memory usage / fix "used memory of Hillshade doesn't calculated" 2021-02-02 10:13:01 +02:00
nazar-kutz
8f302f8558 Data storage refactoring, step 3 2021-02-02 09:41:34 +02:00
nnngrach
9483c80790 Revert "Merge branch 'master' of https://github.com/osmandapp/Osmand"
This reverts commit c2a88ef523, reversing
changes made to 56e8f85c04.
2021-02-02 04:04:07 +03:00
nnngrach
4b6fa3bbef Revert "add default profile name for unnamed or missing improted profiles"
This reverts commit 56e8f85c04.
2021-02-02 04:03:51 +03:00
nnngrach
c2a88ef523 Merge branch 'master' of https://github.com/osmandapp/Osmand 2021-02-02 04:02:47 +03:00
nnngrach
56e8f85c04 add default profile name for unnamed or missing improted profiles 2021-02-02 04:02:43 +03:00
Dima-1
c517b730e4 Fix piste type 2021-02-01 23:40:35 +02:00
vshcherb
1882db7147
Merge pull request #10726 from Nekromanser/patch-1
Update phrases.xml
2021-02-01 21:54:24 +01:00