Commit graph

3145 commits

Author SHA1 Message Date
Allan Nordhøy
e2b44d70ba
New strings reworked 2020-04-30 08:56:17 +00:00
max-klaus
4d498f4e10
Merge branch 'master' into create_custom_poi 2020-04-28 18:14:41 +03:00
max-klaus
8e4a99a82a
Merge pull request #8830 from osmandapp/Discount_badge
Discount badge
2020-04-27 18:44:13 +03:00
veliymolfar
48d76897cf Merge remote-tracking branch 'origin/master' into create_custom_poi 2020-04-23 13:20:50 +03:00
Vitaliy
cf84c56243 Add view pager for images 2020-04-22 23:11:18 +03:00
Dima-1
3d731717c4 Merge branch 'master' into Discount_badge
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-22 22:08:55 +03:00
Dima-1
c66d5601e9 Discount badge on Choose plan 2020-04-22 22:04:00 +03:00
veliymolfar
ab599be3e1 Merge remote-tracking branch 'origin/master' into create_custom_poi
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-22 13:30:28 +03:00
veliymolfar
3daa7a5406 Merge remote-tracking branch 'origin/master' into create_custom_poi 2020-04-21 11:37:19 +03:00
Vitaliy
2967b8f140 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
2020-04-20 17:12:05 +03:00
Hardy
71c4c08fb1
some string typos 2020-04-18 19:26:22 +02:00
aceman444
f3aa497090
Fix typos in strings.xml. 2020-04-18 13:33:34 +02:00
veliymolfar
e317a76bf4 Merge remote-tracking branch 'origin/master' into create_custom_poi
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-17 17:06:44 +03:00
veliymolfar
84e743ec84 initial commit QuickSearchSubCategoriesFragment 2020-04-16 19:07:40 +03:00
Vitaliy
4ca1925ac5 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-16 18:10:19 +03:00
Dima-1
4d5dcc2246 Merge branch 'master' into Fix_2_edit_fav_icons
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-16 17:36:02 +03:00
Vitaliy
309da9c907 Merge branch 'master' of https://github.com/osmandapp/Osmand into Wiki
# Conflicts:
#	OsmAnd/res/values-it/strings.xml
#	OsmAnd/res/values-zh-rTW/strings.xml
2020-04-16 16:18:09 +03:00
Dima-1
a50c15a11c Fix transparency in the favorites.gpx 2020-04-16 13:58:35 +03:00
veliymolfar
7aa3948188 refactor 2020-04-15 17:10:54 +03:00
Dima-1
1e6c829bdf My places redesign 2020-04-15 12:29:17 +03:00
Vitaliy
44a4b93df1 Add downloads to ui initial commit 2020-04-14 16:23:09 +03:00
Nazar-Kutz
989417ffab Wikipedia Poi Fixes (After review) 2020-04-14 09:58:58 +03:00
veliymolfar
0f8c8d8905 reformat 2020-04-13 16:24:44 +03:00
veliymolfar
28df8d4f77 Merge remote-tracking branch 'origin/master' into configure_menu_items
# Conflicts:
#	OsmAnd/src/net/osmand/plus/ContextMenuItem.java
2020-04-08 17:10:49 +03:00
vshcherb
d2b1f577c0
Merge branch 'master' into WikipediaDashboard 2020-04-08 14:59:47 +02:00
veliymolfar
4a3bb2155a Merge remote-tracking branch 'origin/master' into configure_menu_items 2020-04-08 15:58:16 +03:00
veliymolfar
971db3f666 apply to all dialog / work in progress 2020-04-07 14:47:51 +03:00
veliymolfar
e21d00af35 Merge remote-tracking branch 'origin/master' into configure_menu_items
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
2020-04-06 10:54:25 +03:00
Dima-1
f0fc7e1ac4 Merge branch 'master' into select_gpx_track
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-03 20:15:39 +03:00
Dima-1
5d1262f8de Add GPX track select dialog 2020-04-03 20:12:53 +03:00
Vitaliy
16a52a0b5d Merge branch 'master' of https://github.com/osmandapp/Osmand into import_fixes
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-03 17:10:36 +03:00
Vitaliy
649f7e594b Add warnings to settings items 2020-04-03 17:07:41 +03:00
Vitaliy
5522e37b13
Merge pull request #8748 from osmandapp/Fix_1_edit_fav_icons
Fix 1 edit fav icons
2020-04-03 16:51:29 +03:00
Nazar-Kutz
ffb91e735e Show SnackBar when preference change 2020-04-03 15:38:46 +03:00
Dima-1
1273a7b146 Merge branch 'master' into Fix_1_edit_fav_icons
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-02 15:24:39 +03:00
Dima-1
e2ee35da66 Fix context menu after screen rotation, fix description hide. 2020-04-02 15:22:34 +03:00
veliymolfar
07cc37f791 wip 2020-04-01 17:00:15 +03:00
veliymolfar
d3cf8b2729 drawer configure / work in progress 2020-04-01 10:24:44 +03:00
veliymolfar
44d5975ad8 Merge remote-tracking branch 'origin/master' into profile_branding
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/activities/MapActivity.java
2020-03-31 18:55:18 +03:00
Vitaliy
ecf7c29dcd Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-31 13:48:42 +03:00
Nazar-Kutz
7b268cd9d9 Add Wikipedia POI separate screen and logic 2020-03-31 12:41:49 +03:00
Dmitry
a1e8d6871f Merge branch 'master' of https://github.com/osmandapp/Osmand 2020-03-31 11:29:05 +03:00
Dmitry
b01e67013a Add two icons for App profiles: Snowmobile and Ski Touring 2020-03-31 11:29:00 +03:00
Dima-1
da0f697fc0 Add octagon 2020-03-30 19:07:42 +03:00
veliymolfar
dce09ac232 Merge remote-tracking branch 'origin/master' into profile_branding
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-30 11:23:56 +03:00
Vitaliy
88d4365e86 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-30 10:43:31 +03:00
veliymolfar
a8553f6ffe terrain ui fixes 2020-03-26 19:03:42 +02:00
Vitaliy
eb9e15cd6e Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
2020-03-26 16:40:03 +02:00
veliymolfar
20314bd594 Merge remote-tracking branch 'origin/master' into fix_export_import
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-26 11:22:06 +02:00
Vitaliy
b774ccc51d Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
2020-03-26 11:09:53 +02:00