Commit graph

41770 commits

Author SHA1 Message Date
PavelRatushnyi
99a11a0987 Replace group with history markers in button 2017-09-20 12:27:48 +03:00
Alexander Sytnyk
4b3318d197 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-19 19:01:22 +03:00
Alexander Sytnyk
35cbe8ec8a Do not draw the line outside the screen 2017-09-19 19:01:12 +03:00
PavelRatushny
877e5e8446 Refactor groups adapter 2017-09-19 19:00:43 +03:00
PavelRatushny
77b4f070e9 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 18:41:13 +03:00
PavelRatushny
a574a66ea8 Create group header 2017-09-19 18:40:53 +03:00
Alexander Sytnyk
b5f826f886 Add settings and items to menu 2017-09-19 17:56:03 +03:00
Alexander Sytnyk
316cd51776 Change logic for drawing arrows to the first two markers; add drawing of the lines to the first two markers 2017-09-19 16:33:09 +03:00
PavelRatushny
368695c566 Add to and revert from history in groups 2017-09-19 16:19:52 +03:00
PavelRatushny
8bcaca8893 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 13:57:49 +03:00
PavelRatushny
79f2cedc21 Show history in groups 2017-09-19 13:57:24 +03:00
Alexander Sytnyk
b2b9204d4e Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-19 13:40:28 +03:00
Alexander Sytnyk
8e93cc3e96 Add gpx waypoints color syncing; change some logic in gpx points selection 2017-09-19 13:39:22 +03:00
PavelRatushny
bd8040420b Refactor groups 2017-09-19 11:57:23 +03:00
PavelRatushny
e8792e0e39 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 10:27:20 +03:00
PavelRatushny
9c21024e81 Fix item layout 2017-09-19 10:26:55 +03:00
Alex
57fe954b77 Calculate array with colors only one time; rename variable 2017-09-19 08:56:16 +03:00
Alex
38f689eb28 Fix hardcode 2017-09-18 21:19:39 +03:00
Alex
cb42be9d38 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-18 20:11:14 +03:00
Alex
9649a30546 Change colors 2017-09-18 20:11:03 +03:00
PavelRatushny
565de1a651 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-18 19:49:03 +03:00
PavelRatushny
c0899229c0 Create ui for groups 2017-09-18 19:48:30 +03:00
Alex
79fd144eb5 Change algorithm for finding the nearest color 2017-09-18 19:41:36 +03:00
Alex
ee763cfadd Add color syncing 2017-09-18 18:24:56 +03:00
Alexander Sytnyk
7988962bfd Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-18 13:13:29 +03:00
Alexey
c442b04d77 Merge pull request #4449 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-18 13:12:12 +03:00
Alexander Sytnyk
7045e0b28f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-18 13:08:58 +03:00
Alexander Sytnyk
74b7b6546c Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-18 13:08:42 +03:00
Alexander Sytnyk
a5de781e65 Add syncing gpx after change "show on map" and after deleting waypoint 2017-09-18 13:08:25 +03:00
Alexey
d2b80e5ac1 Merge pull request #4439 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-18 13:03:48 +03:00
Alexey
08e055243c Merge branch 'master' into sasha_pasha_branch 2017-09-18 13:03:39 +03:00
Alexander Sytnyk
48b123096b Fix syncAllGroups method; rename items in MapMarkersOrderByMode enum 2017-09-18 12:53:12 +03:00
Alexander Sytnyk
a5f53bfcb1 Extract trimExtension to AndroidUtils; add syncing gpx where needed 2017-09-18 11:58:45 +03:00
Alexander Sytnyk
dab8c1511d Add gpx-sync to methods 2017-09-18 11:03:16 +03:00
vshcherb
2a7e5741d3 Merge pull request #4418 from osmandapp/PaulsBranch
Improved search for OSM Live
2017-09-18 09:23:13 +02:00
Сергій Дубик
f573640e40 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2420 of 2420 strings)
2017-09-18 08:34:18 +02:00
Сергій Дубик
26aa1eff31 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3176 of 3176 strings)
2017-09-18 08:31:36 +02:00
ezjerry liao
341f611389 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2420 of 2420 strings)
2017-09-18 03:40:45 +02:00
Weblate
72fe2bf75e Merge remote-tracking branch 'origin/master' 2017-09-18 00:47:53 +02:00
Roberto GEB
f0d05fe41f Translated using Weblate (Spanish)
Currently translated at 100.0% (3176 of 3176 strings)
2017-09-18 00:47:51 +02:00
Babos Gábor
e31046b88b Translated using Weblate (Hungarian)
Currently translated at 100.0% (3176 of 3176 strings)
2017-09-18 00:47:44 +02:00
Verdulo
d0d4cc0f78 Translated using Weblate (Esperanto)
Currently translated at 99.9% (3174 of 3176 strings)
2017-09-18 00:47:42 +02:00
Verdulo
8491cc9fcb Translated using Weblate (Polish)
Currently translated at 99.3% (2407 of 2422 strings)
2017-09-18 00:47:30 +02:00
Yaron Shahrabani
723d2e9221 Translated using Weblate (Hebrew)
Currently translated at 37.3% (905 of 2422 strings)
2017-09-18 00:47:25 +02:00
Ldm Public
1bf27a76f9 Translated using Weblate (French)
Currently translated at 99.7% (2417 of 2422 strings)
2017-09-18 00:47:17 +02:00
jan madsen
957c07640a Translated using Weblate (Danish)
Currently translated at 99.7% (2417 of 2422 strings)
2017-09-18 00:47:15 +02:00
ezjerry liao
0986125a67 Translated using Weblate (Chinese (Traditional))
Currently translated at 99.9% (2421 of 2422 strings)
2017-09-18 00:47:07 +02:00
PaulStets
be0edb63c7 Further fixes 2017-09-17 12:08:21 +03:00
PaulStets
3cf5085a00 Further fixes 2017-09-17 12:04:02 +03:00
sonora
06927666af use shared_string_topbar 2017-09-17 10:05:28 +02:00