Commit graph

66698 commits

Author SHA1 Message Date
max-klaus
2aa202c41d Fix gradle script 2020-11-24 18:16:29 +03:00
max-klaus
3a6c4c9767 Merge branch 'master' of github.com:osmandapp/Osmand 2020-11-24 18:10:30 +03:00
max-klaus
368c339d30 Fix gradle script 2020-11-24 18:10:18 +03:00
Vitaliy
360338d9de Fix core-sample compilation 2020-11-24 16:38:46 +02:00
max-klaus
e9b3a881b5 OsmAnd library config 2020-11-24 17:07:44 +03:00
Vitaliy
6a085f5d0b
Merge pull request #10256 from osmandapp/fix_add_photos_button
Fix add photos button
2020-11-24 14:00:57 +00:00
Dima-1
0c81c1a1e0 Fix review 2020-11-24 15:59:16 +02:00
Vitaliy
1a4b546351
Merge pull request #10263 from osmandapp/fix_osmedit_setting_dev
Fix "Use dev.openstreetmap.org"  visible
2020-11-24 13:25:44 +00:00
simon
658b675b9b add upload photo error handing 2020-11-24 14:59:30 +02:00
Dima-1
ed5566d4ea Fix "Use dev.openstreetmap.org" should be visible only if "OsmAnd Development" is enabled. 2020-11-24 14:58:44 +02:00
Dima-1
4a56b6cb29 Fix status bar color 2020-11-23 23:56:01 +02:00
Dima-1
ad6c0c420f Merge branch 'master' into fix_add_photos_button
# Conflicts:
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
2020-11-23 23:03:32 +02:00
Dima-1
ef9b018011 Refactoring 2020-11-23 22:57:55 +02:00
Vitaliy
923278a046 Fix compilation 2020-11-23 21:33:15 +02:00
alex-osm
5a6a32bf1f
Merge pull request #10258 from osmandapp/fix_10233
Fix_10233
2020-11-23 19:22:37 +03:00
alex-osm
7993fcf43c
Merge pull request #10259 from osmandapp/fix_10255
Fix_10255
2020-11-23 19:20:42 +03:00
Vitaliy
82dc4e7a92
Merge pull request #10260 from osmandapp/revert-10249-Plan-route-fix-
Revert "Plan Route Fix UI margins"
2020-11-23 15:06:36 +00:00
Vitaliy
21447af2c3
Revert "Plan Route Fix UI margins" 2020-11-23 17:05:16 +02:00
Vitaliy
6340ba68d9
Merge pull request #10218 from osmandapp/issue_251_android_add_photo_backend
Issue 251 Add photo change visibility to hidden
2020-11-23 14:57:19 +00:00
Dima-1
671db0c84a Refactoring 2020-11-23 16:50:59 +02:00
Dima-1
b33de98f31 Merge branch 'master' into fix_add_photos_button
# Conflicts:
#	OsmAnd/src/net/osmand/plus/openplacereviews/OPRWebviewActivity.java
2020-11-23 16:41:38 +02:00
simon
c7f7a9efdc condition added 2020-11-23 15:49:19 +02:00
Vitaliy
5b6e0928a0 Fix #10255 2020-11-23 15:13:44 +02:00
Vitaliy
ee4ea6de8d Fix #10233 2020-11-23 14:59:00 +02:00
max-klaus
74aace6fa9 Move oauth consts to no_translate 2020-11-23 15:25:12 +03:00
MadWasp79
df3c7f5ab5 Wikivoyage to OBF migration: Work in progress 2. 2020-11-23 12:48:09 +02:00
MadWasp79
e130c12ab0 Wikivoyage to OBF migration: Work in progress. 2020-11-23 12:32:54 +02:00
Dima-1
53a3b24c6c Fix add point button 2020-11-23 12:04:10 +02:00
simon
0462f635a8 visibility updated 2020-11-23 11:17:18 +02:00
simon
5a91901eee conflict resolved 2020-11-23 11:02:02 +02:00
alex-osm
a661ce677f
Merge pull request #10252 from osmandapp/import_ui
Import settings UI
2020-11-23 11:41:39 +03:00
simon
4035885842 Merge branch 'master' of git://github.com/osmandapp/Osmand into issue_251_android_add_photo_backend 2020-11-23 09:51:52 +02:00
Vitaliy
9d5464b82c Add BaseSettingsListFragment 2020-11-23 03:42:59 +02:00
Vitaliy
7de4b6149c
Merge pull request #10236 from TacoTheDank/master
Miscellaneous performance lints
2020-11-23 01:34:42 +00:00
Vitaliy
9056c7e97b Minor fixes 2020-11-23 03:27:09 +02:00
Vitaliy
bb0099d17a Merge branch 'masterOrig'
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
2020-11-23 02:25:24 +02:00
Vitaliy
0b80164ab9
Merge pull request #9785 from osmandapp/Point_menu_change_route_type
Point_menu
2020-11-23 00:13:43 +00:00
Vitaliy
c9b6baabfd small fixes 2020-11-23 02:12:13 +02:00
Ldm Public
8ae721b378
Translated using Weblate (French)
Currently translated at 99.8% (3561 of 3568 strings)
2020-11-23 00:29:05 +01:00
Samantaz Fox
a0951c6e46
Translated using Weblate (French)
Currently translated at 99.8% (3561 of 3568 strings)
2020-11-23 00:29:05 +01:00
Hosted Weblate
423902e115
Merge branch 'origin/master' into Weblate. 2020-11-22 23:45:44 +01:00
Verdulo
c78b8d67b6
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3860 of 3860 strings)
2020-11-22 23:45:44 +01:00
Ajeje Brazorf
85df5e8500
Translated using Weblate (Sardinian)
Currently translated at 99.6% (3847 of 3860 strings)
2020-11-22 23:45:43 +01:00
Samantaz Fox
9037efc465
Translated using Weblate (French)
Currently translated at 98.8% (3816 of 3860 strings)
2020-11-22 23:45:41 +01:00
Ajeje Brazorf
1c8157bd84
Translated using Weblate (Sardinian)
Currently translated at 99.7% (3558 of 3566 strings)
2020-11-22 23:45:40 +01:00
Pavel Kotrč
c439422ee0
Translated using Weblate (Czech)
Currently translated at 91.6% (3270 of 3566 strings)
2020-11-22 23:45:40 +01:00
ace shadow
37c74c6bd8
Translated using Weblate (Slovak)
Currently translated at 99.8% (3562 of 3566 strings)
2020-11-22 23:45:39 +01:00
Mirco Zorzo
212f212c65
Translated using Weblate (Italian)
Currently translated at 89.0% (3175 of 3566 strings)
2020-11-22 23:45:39 +01:00
Ihor Hordiichuk
4c33a042ee
Translated using Weblate (Ukrainian)
Currently translated at 99.9% (3565 of 3566 strings)
2020-11-22 23:45:38 +01:00
Ldm Public
dd40dadae8
Translated using Weblate (French)
Currently translated at 99.7% (3558 of 3566 strings)
2020-11-22 23:45:37 +01:00