3205 commits

Author	SHA1	Message	Date
vshcherb	c0fbbdc0d8	Merge branch 'master' into patch-23	2020-05-01 17:23:19 +02:00
vshcherb	e60fd3d137	Merge pull request #8870 from aceman444/patch-1 ... Add missing space in strings.xml	2020-05-01 17:17:23 +02:00
Dmitry	211ccd05eb	fix string	2020-04-30 19:21:48 +03:00
Eugene	14f32500fb	Update strings.xml	2020-04-30 18:24:09 +03:00
aceman444	10df688e44	Add missing space in strings.xml	2020-04-30 16:01:31 +02:00
veliymolfar	d1a1942907	use one string for "Actions"	2020-04-30 16:24:43 +03:00
Eugene	c61c1eecd8	Update strings.xml	2020-04-30 13:34:28 +03:00
Eugene	e895935a23	Update strings.xml	2020-04-30 13:22:47 +03:00
Allan Nordhøy	e2b44d70ba	New strings reworked	2020-04-30 08:56:17 +00:00
veliymolfar	1736b3c789	context menu actions fixes / tracker item fix / ui fixes	2020-04-29 15:22:47 +03: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	3c0bd48945	ui fixes	2020-04-24 14:33:06 +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
max-klaus	67a9205157	Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp	2020-03-25 20:59:00 +03:00
veliymolfar	de7de14ba7	Merge branch 'master' of https://github.com/osmandapp/Osmand into profile_branding ... Conflicts: OsmAnd/res/values/sizes.xml OsmAnd/res/values/strings.xml	2020-03-25 18:14:09 +02:00
veliymolfar	eff1c23734	initial commit	2020-03-25 18:13:17 +02:00
veliymolfar	0e490905cc	Merge branch 'master' of https://github.com/osmandapp/Osmand into fix_export_import ... Conflicts: OsmAnd/res/values/strings.xml	2020-03-23 17:42:39 +02:00
veliymolfar	94693bc53d	refactor	2020-03-23 16:22:07 +02:00
veliymolfar	b9ba5c926c	Merge branches 'master' and 'slope_hillshade_ui' of https://github.com/osmandapp/Osmand into slope_hillshade_ui ... Conflicts: OsmAnd/res/values/strings.xml OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java OsmAnd/src/net/osmand/plus/quickaction/actions/HillshadeAction.java OsmAnd/src/net/osmand/plus/quickaction/actions/TerrainAction.java OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeAction.java	2020-03-23 15:52:57 +02:00
veliymolfar	7cfa03732b	refactor / Hillshade action to Terrain	2020-03-23 14:04:29 +02:00
Vitaliy	3e81b5926e	Merge branch 'master' into custom_plugins ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/OsmandPlugin.java # OsmAnd/src/net/osmand/plus/SettingsHelper.java # OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java # OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java	2020-03-23 13:41:47 +02:00
veliymolfar	db2fa7f99b	ui fixes / fix import duplicates profiles	2020-03-20 18:55:36 +02:00
Vitaliy	a2c5624930	Add string resource	2020-03-19 18:13:20 +02:00
Nazar-Kutz	5d1bd56dd9	Change Settings UI -> Distance to recalculate	2020-03-19 15:20:18 +02:00
Dmitry	941cdac065	Change description in Rearange search categories screen	2020-03-19 13:34:25 +02:00
sonora	9c6f2e5e94	Introduce shared_string_appearance	2020-03-17 09:55:57 +01:00
Dima-1	0ff96f333b	Fix color. Add replace and delete.	2020-03-17 09:03:37 +02:00
veliymolfar	8dac325964	Merge remote-tracking branch 'origin/master' into slope_hillshade_ui ... # Conflicts: # OsmAnd/res/values/strings.xml	2020-03-13 17:13:50 +02:00
veliymolfar	9331442a29	Add slope data to Downloads / slopes visualization	2020-03-12 18:59:53 +02:00
veliymolfar	d361f78f1f	Merge branch 'master' of https://github.com/osmandapp/Osmand into slope_hillshade_ui	2020-03-12 10:25:48 +02:00
max-klaus	4e7687371c	Remove duplicate string	2020-03-11 21:49:40 +03:00
max-klaus	6cdc6a8fb8	Revert "remove duplicate string" ... This reverts commit 94594b81c2.	2020-03-11 21:47:16 +03:00
veliymolfar	94594b81c2	remove duplicate string	2020-03-11 18:13:53 +02:00
Nazar-Kutz	e2b0ace021	Merge branch 'r3.6' ... # Conflicts: # OsmAnd/build.gradle # OsmAnd/res/layout/fragment_import.xml # OsmAnd/res/layout/fragment_import_duplicates.xml # OsmAnd/res/layout/list_menu_item_native.xml # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/UiUtilities.java # OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java # OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java # OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java # OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java # OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java # OsmAnd/src/net/osmand/plus/widgets/OsmandTextFieldBoxes.java	2020-03-11 12:08:04 +02:00
max-klaus	9931e88073	Revert "Merge 'r3.6' to 'master' (Fix conflicts)"	2020-03-11 11:28:43 +03:00
veliymolfar	e5d399b12f	Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish ... Conflicts: OsmAnd/res/values/strings.xml OsmAnd/src/net/osmand/plus/SettingsHelper.java	2020-03-10 13:48:29 +02:00
Nazar-Kutz	60ee95d93c	Merge 'r3.6' to 'master'	2020-03-10 12:03:41 +02:00
veliymolfar	65d9f5f910	terrain ui work in progress	2020-03-06 18:51:04 +02:00
veliymolfar	5d2bfca53e	Merge remote-tracking branch 'origin/master' into slope_hillshade_ui	2020-03-06 17:43:39 +02:00
Yaron Shahrabani	aaa917693d	Typo fix ... prexif -> prefix	2020-03-06 16:50:08 +02:00
veliymolfar	ca9e8eea2c	Merge remote-tracking branch 'origin/master' into slope_hillshade_ui ... # Conflicts: # OsmAnd/res/values/strings.xml	2020-03-06 11:55:42 +02:00
Dima-1	c670aa2d8b	Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/data/FavouritePoint.java	2020-03-06 11:28:40 +02:00
veliymolfar	91f9268abf	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
veliymolfar	bb9858e577	Merge remote-tracking branch 'origin/master' into prepare_importing_finish ... # Conflicts: # OsmAnd/res/layout/fragment_import.xml # OsmAnd/res/layout/fragment_import_duplicates.xml # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/UiUtilities.java # OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java # OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java	2020-03-05 11:02:45 +02:00
Dima-1	97f2f749e2	Add name and description	2020-03-04 19:08:42 +02:00
veliymolfar	24625ca410	terrain ui initial commit	2020-03-04 19:07:41 +02:00
veliymolfar	e95da9cb61	terrain screen strings	2020-03-04 12:22:19 +02:00
veliymolfar	3951393834	refactor	2020-03-04 10:20:55 +02:00
Vitaliy	ca742998dc	Update restore and reset dialog UI	2020-03-03 21:45:43 +02:00
veliymolfar	0849d736b9	change subtitle "items added:"	2020-03-03 10:49:56 +02:00
Vitaliy	fc29ed3651	Merge branch 'master' into restore_custom_modes ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java	2020-03-02 17:14:42 +02:00
Vitaliy	145faf5168	Add import rendering files	2020-03-02 15:39:58 +02:00
veliymolfar	6afde41f19	complete settings screen	2020-02-28 11:14:57 +02:00