Commit graph

2370 commits

Author SHA1 Message Date
PavelRatushny
aeb2bc50d1 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_groups
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
2017-11-17 10:13:46 +02:00
alex
7f1f8540f0 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui
# Conflicts:
#	OsmAnd/res/values/strings.xml
2017-11-17 01:25:06 +02:00
Pavel Ratushnyi
03c156da28
Merge pull request #4745 from osmandapp/change_options_menu
Change markers options menu
2017-11-16 18:48:55 +02:00
Alexander Sytnyk
bce0fd7862 Change ui for notes list 2017-11-16 15:09:58 +02:00
PavelRatushny
ef1ab8307e Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_empty_states
# Conflicts:
#	OsmAnd/res/values/strings.xml
2017-11-15 16:09:52 +02:00
Alexander Sytnyk
473c82e19d Merge branch 'master' of ssh://github.com/osmandapp/Osmand into new_notes_ui 2017-11-15 12:31:25 +02:00
Hardy
974d469002
string improvements 2017-11-15 08:54:46 +01:00
Alexander Sytnyk
ae15913626 Add sort menu 2017-11-14 19:06:09 +02:00
Alexander Sytnyk
2492b3aaa5 Change markers options menu 2017-11-13 19:06:44 +02:00
PavelRatushny
f4023816c6 Show text when loading tracks 2017-11-13 16:42:38 +02:00
PavelRatushny
eb8fc84402 Fix string 2017-11-13 16:11:27 +02:00
Hardy
63f4367d52
string improvement 2017-11-11 08:42:03 +01:00
Hardy
baa576d16a
string improvements 2017-11-11 08:34:06 +01:00
Alexander Sytnyk
c08d5e086d Change images order and string 2017-11-10 18:35:01 +02:00
PavelRatushny
ee96bcb5c2 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_empty_states
# Conflicts:
#	OsmAnd/res/values/strings.xml
2017-11-10 12:45:15 +02:00
PavelRatushny
c356d103d1 Create menu for favourites 2017-11-09 18:03:50 +02:00
alex
7ea8fac0d3 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into direction_indication 2017-11-09 17:32:28 +02:00
Hardy
00c0b2495d
spelling 2017-11-09 16:10:29 +01:00
alex
ee46bb2680 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into direction_indication 2017-11-09 15:20:12 +02:00
PavelRatushny
5a7aeaa1f5 Resolve conflicts 2017-11-09 14:39:29 +02:00
PavelRatushny
b53c1eebb7 Create selection menu 2017-11-09 14:08:43 +02:00
alex
2d1db11a49 Add the ability to select the number of widgets to display 2017-11-09 13:58:53 +02:00
sonora
01e882e70c fix strings for POI Overlay 2017-11-09 08:25:42 +01:00
sonora
89b19a95b2 update string for #4461 2017-11-09 07:56:39 +01:00
Alexander Sytnyk
ed1e04f6af Create DirectionIndicationDialogFragment 2017-11-08 20:11:12 +02:00
Alexey
1cdd5f5346
Merge pull request #4702 from osmandapp/coordinate_input_screen
Coordinate input screen
2017-11-08 16:32:10 +03:00
PavelRatushny
88f533a84f Add empty states to markers 2017-11-08 14:22:28 +02:00
sonora
60009de4df string cleanup 2017-11-08 02:52:46 +01:00
PavelRatushnyi
d05645d702 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into coordinate_input_screen
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/res/values/styles.xml
2017-11-07 22:43:44 +02:00
Alexander Sytnyk
1e64a28473 Add the ability to rename the marker from the context menu 2017-11-07 16:59:39 +02:00
sonora
123bc08758 Clarify free downloads 2017-11-03 17:55:15 +01:00
sonora
6e428323f7 punctuation (de) 2017-11-02 09:35:33 +01:00
sonora
c4ff30195c punctuation 2017-11-02 09:04:04 +01:00
Hardy
b908a30680
string improvement 2017-11-02 00:24:54 +01:00
Hardy
21e3339114
string improvements 2017-11-01 17:58:34 +01:00
Alexander Sytnyk
e35c70b5f1 Add setting 2017-11-01 18:22:51 +02:00
Alexander Sytnyk
381ccc0315 Add subtitle button to the context menu; add "Show on Top Bar" button to the context menu of the marker 2017-10-31 12:47:45 +02:00
Alexander Sytnyk
1ab34b31d9 Change the button in the context menu of the marker 2017-10-30 19:07:34 +02:00
alex
f3ec5730d6 Add actions to buttons; change description 2017-10-27 14:45:55 +03:00
Alexander Sytnyk
be977966f8 Add new import gpx menu 2017-10-26 19:37:20 +03:00
PavelRatushny
da53d30774 Fix waypoints
(cherry picked from commit 135d01b)
2017-10-20 17:40:32 +03:00
Alexander Sytnyk
fe137938bc Add error message and name check 2017-10-20 15:15:10 +03:00
Alexander Sytnyk
c95348658f Add fragment for renaming marker 2017-10-20 15:14:39 +03:00
Alexander Sytnyk
3b1e96bf75 Add new marker menu on map 2017-10-20 15:13:22 +03:00
PavelRatushnyi
6091daeaab FIx crash in proxy setting
(cherry picked from commit 9050c44)
2017-10-18 11:50:12 +03:00
Alexey Kulish
309e6f4bfd Fix #4301 2017-10-15 10:17:13 +03:00
PavelRatushny
ff6ccb3726 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-10-13 15:16:06 +03:00
Dmitriy Prodchenko
227f362e9e Rename OSM Live.
Rename OSM Live to OsmAnd Live.
2017-10-13 12:43:13 +03:00
Alex
7cbbe99166 Replace toast with snackbar 2017-10-13 12:16:59 +03:00
vshcherb
81f6059dc5 Merge pull request #4565 from osmandapp/favourites_fix
Add default color to change color dialog
2017-10-13 10:46:56 +02:00
Alex
5a869dfaee Add round trip finish item 2017-10-13 10:44:29 +03:00
PavelRatushny
536ad23ffb Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-10-12 16:27:48 +03:00
Dmitriy Prodchenko
e5cd2c2656 Update grammar in release notes. 2017-10-12 15:11:22 +03:00
Dmitriy Prodchenko
f4be1d9e12 Add Release notes 2.8 2017-10-12 14:53:35 +03:00
Alex
71127dc4b9 Close full screen after finishing snap to road 2017-10-11 18:12:21 +03:00
Alex
cee59feda8 Do not open plan route without active markers; add null-checks 2017-10-11 18:00:32 +03:00
PavelRatushny
25741a9f97 Add default color to change color dialog 2017-10-10 11:23:10 +03:00
Alexey
526e8ddb28 Merge branch 'master' into osm_notes_edit 2017-10-06 11:27:09 +03:00
Alexander Sytnyk
a048d1d9fd Replace sort by menu with options menu 2017-10-05 13:45:21 +03:00
Dmitriy Prodchenko
3d735f16b1 Add new icon for Plan Route > Round Trip. Change string for markers. 2017-10-05 12:46:30 +03:00
Hardy
080ea268af Better caption for #4524 2017-10-05 08:31:10 +02:00
PavelRatushnyi
69305c7409 Merge branch 'osm_notes_edit' of ssh://github.com/osmandapp/Osmand into osm_notes_edit 2017-10-03 16:39:57 +03:00
PavelRatushny
042c22d408 Add possibility to modify osm note 2017-10-03 12:11:18 +03:00
Alexander Sytnyk
1ba54c3ba1 Rename menu item; remove unnecessary string 2017-10-02 12:04:06 +03:00
Hardy
fd20d63f17 spelling 2017-10-01 10:27:11 +02:00
sonora
4e62a47337 string improvements 2017-10-01 09:04:59 +02:00
Alexey
263ee851a3 Merge branch 'master' into sasha_pasha_branch 2017-09-29 16:03:28 +03:00
xmd5a
f7242538de Add string 2017-09-29 15:01:32 +03:00
Alexander Sytnyk
e871dc064d Add displaying the count of selected markers; extract variables 2017-09-29 14:29:22 +03:00
PavelRatushny
27c204643d Add option menu and keyboard styling 2017-09-28 19:02:56 +03:00
PavelRatushny
84bc403963 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-28 17:01:36 +03:00
PavelRatushny
e92ecfa26f Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-28 15:36:12 +03:00
PavelRatushny
e72d419e9a Add support for different coordinate formats 2017-09-28 15:35:36 +03:00
Alexander Sytnyk
20a99ac9c6 Replace Use My Location card with location item 2017-09-28 14:54:20 +03:00
PavelRatushnyi
48e051e859 Add coordinate format dialog 2017-09-28 12:02:43 +03:00
sonora
06f7d751f6 string improvement 2017-09-28 08:46:42 +02:00
sonora
d5f09cc053 string improvements 2017-09-28 07:06:35 +02:00
Hardy
03315c4ac0 string improvement 2017-09-27 22:22:48 +02:00
Alexey
330980dc2e Merge pull request #4490 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-27 12:49:25 +03:00
Alexander Sytnyk
1d67432fc6 Add use location card 2017-09-26 19:03:08 +03:00
Alexander Sytnyk
a91946f873 Add adapter and related stuff 2017-09-26 16:07:36 +03:00
Alexander Sytnyk
4dc734e4b3 Add Plan Route fragment and related stuff; fix some small bugs 2017-09-25 19:48:55 +03:00
PavelRatushny
83fd9df764 Add coordinate input screen 2017-09-25 19:20:47 +03:00
PavelRatushny
dbfd5bb288 Add save as track dialog 2017-09-25 16:54:32 +03:00
Hardy
fba19a853b Update strings.xml
Try improve some strings
2017-09-23 08:50:47 +02:00
PavelRatushny
41bf5e3abf Add swipes with snackbar in groups 2017-09-21 17:28:59 +03:00
PavelRatushny
fdd2c80244 Show snackbar when toggle switch in groups 2017-09-21 14:53:08 +03:00
Alexander Sytnyk
b5f826f886 Add settings and items to menu 2017-09-19 17:56:03 +03:00
PavelRatushny
bd8040420b Refactor groups 2017-09-19 11:57:23 +03:00
Alexey
08e055243c Merge branch 'master' into sasha_pasha_branch 2017-09-18 13:03:39 +03:00
sonora
06927666af use shared_string_topbar 2017-09-17 10:05:28 +02:00
sonora
69d111910f fix apostrophe 2017-09-16 10:00:43 +02:00
sonora
f392aec0c2 string improvements 2017-09-16 09:47:30 +02:00
sonora
2c8dc525d1 some string work 2017-09-16 09:24:37 +02:00
Alexander Sytnyk
8430f9d5fb Add "Remove from Map Markers" item to EditFavoriteGroupDialog 2017-09-15 16:18:30 +03:00
PavelRatushny
cf2017b275 Add possibility to change order by mode 2017-09-15 15:11:21 +03:00
PavelRatushny
877ee34fbe Resolve conflicts 2017-09-15 13:35:45 +03:00
PavelRatushny
a35774dd58 Add order by menu 2017-09-15 12:33:45 +03:00
PavelRatushny
07d56a7316 Resolve conflicts 2017-09-15 11:56:43 +03:00
PavelRatushny
5caf65e840 Add snackbar for move all to history 2017-09-14 18:32:20 +03:00