Commit graph

41899 commits

Author SHA1 Message Date
PavelRatushnyi
2443b60263 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 12:28:48 +03:00
PavelRatushnyi
99a11a0987 Replace group with history markers in button 2017-09-20 12:27:48 +03:00
Alexander Sytnyk
458dfe589f Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch
# Conflicts:
#	OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
2017-09-20 11:05:21 +03:00
Alexander Sytnyk
6147666878 Disable focusability on switches 2017-09-20 11:04:41 +03:00
Alexander Sytnyk
949978734b Disable focusability on switches 2017-09-20 10:54:29 +03:00
Alexander Sytnyk
a03cc63616 Extract default color from loop 2017-09-20 10:43:04 +03:00
LL
4393b7d5cd Translated using Weblate (French)
Currently translated at 99.6% (2416 of 2425 strings)
2017-09-19 22:09:20 +02:00
Verdulo
5d5fa540f1 Translated using Weblate (Esperanto)
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 21:34:16 +02:00
Viktar Vauchkevich
8ac4f2dba5 Translated using Weblate (Belarusian (latin))
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 19:28:02 +02:00
Viktar Vauchkevich
2012ce3fb3 Translated using Weblate (Belarusian)
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 19:27:15 +02: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
Weblate
8f4408d959 Merge remote-tracking branch 'origin/master' 2017-09-19 17:19:16 +02:00
Franco
6694d19d4d Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 17:19:04 +02:00
josep constanti
dd83f2582f Translated using Weblate (Catalan)
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 17:18:45 +02:00
Alexey
00a4de462b Merge pull request #4456 from osmandapp/PaulsBranch
Fixed issue #4447
2017-09-19 18:12:54 +03:00
PaulStets
5182a723b1 Fixed issue #4447 2017-09-19 18:10:45 +03:00
Alexander Sytnyk
b5f826f886 Add settings and items to menu 2017-09-19 17:56:03 +03:00
Franco
06a955b172 Translated using Weblate (Spanish (American))
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 15:36:11 +02: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
Franco
b8162b7004 Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 15:25:46 +02:00
PavelRatushny
368695c566 Add to and revert from history in groups 2017-09-19 16:19:52 +03:00
PaulStets
1e72f7f5e3 Fixed issue #4447 2017-09-19 16:18:33 +03:00
PaulStets
2f43745cad Fixed issue #4447 2017-09-19 16:16:28 +03:00
PaulStets
db5d79fa2d Fixed issue #4447 2017-09-19 16:02:38 +03:00
Weblate
903e3aa6fa Merge remote-tracking branch 'origin/master' 2017-09-19 13:56:11 +02:00
ezjerry liao
28d92ac21d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2425 of 2425 strings)
2017-09-19 13:55:36 +02: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
Alexey
63b3cdaa18 Merge pull request #4451 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-19 10:11:23 +03:00
Alex
57fe954b77 Calculate array with colors only one time; rename variable 2017-09-19 08:56:16 +03:00
Weblate
41bd9b3a75 Merge remote-tracking branch 'origin/master' 2017-09-19 06:45:41 +02:00
Piotr Sokół
832923ed68 Translated using Weblate (Polish)
Currently translated at 99.3% (2405 of 2420 strings)
2017-09-19 06:45:23 +02:00
Allan Nordhøy
11dcdd8aa2 Translated using Weblate (Norwegian Bokmål)
Currently translated at 87.3% (2114 of 2420 strings)
2017-09-19 06:45:21 +02:00
Mirco Zorzo
c991ed5ae0 Translated using Weblate (Italian)
Currently translated at 98.3% (2381 of 2420 strings)
2017-09-19 06:45:17 +02:00
jan madsen
d8092fbe99 Translated using Weblate (Danish)
Currently translated at 99.9% (2419 of 2420 strings)
2017-09-19 06:45:10 +02:00
ezjerry liao
e22c000e32 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2420 of 2420 strings)
2017-09-19 06:45:08 +02:00
ezjerry liao
9f328201f1 Translated using Weblate (Chinese (Traditional))
Currently translated at 99.9% (3174 of 3176 strings)
2017-09-19 06:44:56 +02: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