Commit graph

61842 commits

Author SHA1 Message Date
MadWasp79
87a7b42f66 work in project, crude merge working 2020-05-08 16:40:58 +03:00
Dmitry
958dfa0250 Replace 50 icons with vector copies 2020-05-07 18:39:12 +03:00
max-klaus
9e94a1deaa
Merge pull request #8909 from osmandapp/FixTransportAction
Do not include public transport to rendering rules list
2020-05-07 17:31:46 +03:00
Nazar-Kutz
42f20ed93f remove unused code 2020-05-07 16:38:27 +03:00
Nazar-Kutz
1706c809e1 Remove "Transport" from "Map rendering" section of Configure Map menu 2020-05-07 16:33:53 +03:00
Dmitry
66060f78b2 Replace 50 app icons for vector copies 2020-05-07 14:49:38 +03:00
Nazar-Kutz
98d02f7e8e Remove "Transport" from "Map rendering" section of Configure Map menu 2020-05-07 14:36:10 +03:00
Dmitry
c6f59d9d54 Replace duplicate icon 2020-05-07 14:35:07 +03:00
Nazar-Kutz
aa8d0d5363 Do not include public transport to rendering rules list 2020-05-07 14:22:09 +03:00
Dmitry
56aff6b1e0 Replace ~50 icons with vector 2020-05-07 12:51:02 +03:00
Dmitry
9ba43fe2a9 Delete unused icons, replace favorite and marker icons with vector 2020-05-07 12:34:29 +03:00
max-klaus
778f4aaf3c
Merge pull request #8895 from osmandapp/Fix_my_places_edit_fav
Fix my places and edit favorites
2020-05-06 18:48:43 +03:00
vshcherb
7b9b3b046b
Merge pull request #8905 from osmandapp/fix_8862
Add quick action info to intent api
2020-05-06 17:41:30 +02:00
Vitaliy
6aa421dc04 Add get quick action info to intent api 2020-05-06 18:35:33 +03:00
Dima-1
e4685ac04f Merge branch 'master' into Fix_my_places_edit_fav
# Conflicts:
#	OsmAnd/res/values-large/sizes.xml
#	OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
2020-05-06 18:26:33 +03:00
Dima-1
dfdd6d5729 Fix black color favorite icon. 2020-05-06 18:17:42 +03:00
vshcherb
062f286141
Merge pull request #8904 from osmandapp/fix_8092
Fix_8092
2020-05-06 17:02:55 +02:00
Vitaliy
83e6deba75 Fix #8092 2020-05-06 17:46:29 +03:00
vshcherb
b905b7aa5c
Merge pull request #8903 from osmandapp/fix_8862
Update tracker aidl api
2020-05-06 16:04:12 +02:00
Vitaliy
dc4f41c472 Update tracker aidl api 2020-05-06 16:57:19 +03:00
vshcherb
aa8bed7e65
Merge pull request #8902 from osmandapp/fix_8862
Fix_8862
2020-05-06 15:34:11 +02:00
Vitaliy
ab7b0bf57e Add quickActionsInfo to aidl 2020-05-06 15:37:17 +03:00
max-klaus
5f18edeac1 Fix #8835 2020-05-06 15:34:43 +03:00
max-klaus
e8fbc6847b
Merge pull request #8860 from osmandapp/configure_menu_items_fix
Configure menu items fix
2020-05-06 15:30:30 +03:00
veliymolfar
7aa599e2bb refactor 2020-05-06 15:28:55 +03:00
Dmitry
be3dc077f8 Merge branch 'master' of https://github.com/osmandapp/Osmand 2020-05-06 15:03:06 +03:00
Dmitry
a716b949ad Undo changes for string 2020-05-06 15:02:52 +03:00
veliymolfar
b96c227ec7 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
#	OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
2020-05-06 15:01:54 +03:00
Vitaliy
d24f8d3a75 Update tracker aidl 2020-05-06 15:00:11 +03:00
veliymolfar
8a60632ee8 copy ids prefs rom another profile fix 2020-05-06 14:54:51 +03:00
Vitaliy
b80a10b737 Merge branch 'master' into fix_8862 2020-05-06 14:46:32 +03:00
Vitaliy
1b16a9122e Add intent call to execute quick action 2020-05-06 14:43:54 +03:00
vshcherb
e8a8dcfec9
Merge pull request #8900 from osmandapp/fix_8726
Fix_8726
2020-05-06 13:40:03 +02:00
veliymolfar
9c7597f0cb refactor OnItemDeleteAction 2020-05-06 14:37:40 +03:00
Vitaliy
9d5dc7e4d3 Fix #8726 2020-05-06 14:24:39 +03:00
Vitaliy
da1a065846 Fix #8862 2020-05-06 14:01:51 +03:00
Vitaliy
100561be7b Update tracker aidl 2020-05-06 13:57:16 +03:00
vshcherb
561b8bce94
Merge pull request #8891 from osmandapp/Fix_8600
Fix #8600
2020-05-06 12:46:15 +02:00
vshcherb
a8627f0424
Merge pull request #8887 from osmandapp/check_icon_for_tablet
Check icon for tablet
2020-05-06 12:37:17 +02:00
veliymolfar
ee0d9677af possibility to change dialog cancel button title 2020-05-06 13:35:57 +03:00
Dima-1
99ba27a81c Merge branch 'master' into check_icon_for_tablet
# Conflicts:
#	OsmAnd/res/layout/global_preference_toolbar.xml
#	OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
#	OsmAnd/res/layout/profile_preference_toolbar.xml
#	OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
2020-05-06 13:31:08 +03:00
veliymolfar
3d7a6341cc change reset dialog message 2020-05-06 13:17:45 +03:00
veliymolfar
7f47061379 remove reset items call 2020-05-06 13:02:59 +03:00
veliymolfar
dadfc2556a fix wrong settings keys 2020-05-06 12:56:32 +03:00
veliymolfar
df79d568fd fix string add/edit 2020-05-06 12:52:10 +03:00
veliymolfar
e1b1756dd8 remove position from ContextMenuItem 2020-05-06 12:51:10 +03:00
vshcherb
f7e7b388cc
Merge pull request #8894 from osmandapp/fix_8774
Fix_8774
2020-05-06 11:39:09 +02:00
veliymolfar
125ede4e5d refactor MainContextMenuItemsSettings 2020-05-06 11:29:42 +03:00
veliymolfar
99fafc9a9d Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values-hu/strings.xml
#	OsmAnd/res/values-sc/strings.xml
#	OsmAnd/res/values-uk/strings.xml
2020-05-06 10:56:03 +03:00
Hosted Weblate
f97ab33e56
Merge branch 'origin/master' into Weblate. 2020-05-05 22:12:23 +02:00