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 |
|
Vitaliy
|
ceb0a5ab88
|
Change clear data dialog
|
2020-02-27 13:44:59 +02:00 |
|
veliymolfar
|
72971f3e13
|
import complete screen
|
2020-02-27 13:11:18 +02:00 |
|
veliymolfar
|
5b9c9245fd
|
initial commit
|
2020-02-26 18:31:06 +02:00 |
|
Vitaliy
|
5a6540b10b
|
Merge branch 'master' into restore_custom_modes
# Conflicts:
# OsmAnd/src/net/osmand/plus/SettingsHelper.java
|
2020-02-26 11:06:50 +02:00 |
|
veliymolfar
|
fb428c931b
|
refactor duplicateItems
|
2020-02-25 11:05:27 +02:00 |
|
Vitaliy
|
c9086f78f4
|
Backup created profile
|
2020-02-24 17:34:00 +02:00 |
|
veliymolfar
|
321aa96846
|
avoid roads, refactor, corrections
|
2020-02-21 18:03:28 +02:00 |
|
veliymolfar
|
e3c9cce6b1
|
Merge remote-tracking branch 'origin/master' into import_screen
|
2020-02-20 14:02:46 +02:00 |
|
veliymolfar
|
1af5cb9eaf
|
Merge remote-tracking branch 'origin/master' into import_screen
|
2020-02-20 10:25:45 +02:00 |
|
Vitaliy
|
018cc182c0
|
Remove unnecessary preference
|
2020-02-19 18:54:32 +02:00 |
|
Vitaliy
|
04bd798880
|
Change profile description
|
2020-02-19 18:47:17 +02:00 |
|
veliymolfar
|
5256ac14b2
|
refactor & corrections
|
2020-02-19 17:48:29 +02:00 |
|
vshcherb
|
e34d27b169
|
Update strings.xml
|
2020-02-18 16:18:55 +01:00 |
|
veliymolfar
|
e90ff36dc2
|
Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
|
2020-02-18 17:00:16 +02:00 |
|
veliymolfar
|
b5f5e0e916
|
copy of copy base profiles, ui fixes
|
2020-02-18 16:15:24 +02:00 |
|
MadWasp79
|
ffc52efb41
|
settings cleaning
added angle preference
|
2020-02-18 15:37:26 +02:00 |
|
Victor Shcherb
|
b3466bcf69
|
Merge branch 'straight_to'
Conflicts:
OsmAnd/res/values/strings.xml
OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
|
2020-02-17 20:14:45 +01:00 |
|
Victor Shcherb
|
49f901998d
|
Clean up
|
2020-02-17 18:22:30 +01:00 |
|
Vitaliy
|
00237eabda
|
Change notification preference description
|
2020-02-17 11:16:57 +02:00 |
|
Vitaliy
|
acf6d7b91e
|
Fix #4635
|
2020-02-16 19:31:42 +02:00 |
|
veliymolfar
|
c7f2de7f22
|
import ui, duplicate quick actions, files, small fixes
|
2020-02-14 19:05:14 +02:00 |
|
MadWasp79
|
a577b25b86
|
fix settings
|
2020-02-14 17:52:35 +02:00 |
|
veliymolfar
|
0470f93284
|
Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-02-14 11:23:42 +02:00 |
|
MadWasp79
|
6844c25945
|
Merge branch 'master' into straight_to
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-02-14 11:19:44 +02:00 |
|
MadWasp79
|
1578f4c91c
|
settings change
|
2020-02-14 11:16:06 +02:00 |
|
Nazar-Kutz
|
b499043a2d
|
Fix Manage Profiles bugs
|
2020-02-13 19:53:01 +02:00 |
|
veliymolfar
|
784cb45667
|
Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
# OsmAnd/res/values/strings.xml
# OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
|
2020-02-13 19:03:08 +02:00 |
|
veliymolfar
|
3f753c5677
|
import ui, duplicate quick actions
|
2020-02-13 18:49:31 +02:00 |
|
vshcherb
|
5b0177285b
|
Merge branch 'master' into exp_imp_profile_with_features
|
2020-02-13 15:57:12 +01:00 |
|
MadWasp79
|
597a3518fe
|
Merge branch 'master' into straight_to
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-02-13 16:47:43 +02:00 |
|
vshcherb
|
8cee733641
|
Merge pull request #8452 from verdulo/master
fixed untranslated string "Antarctica" | riparis netradukeblan tekston "Antarctica"
|
2020-02-13 15:42:43 +01:00 |
|
vshcherb
|
ad41588386
|
Merge pull request #8450 from osmandapp/plugins_prefs_fixes
Plugins prefs fixes
|
2020-02-13 15:40:01 +01:00 |
|
MadWasp79
|
38e935fb96
|
fix settings formatting
calculate pointToReturn on track.
|
2020-02-13 16:37:13 +02:00 |
|
Vitaliy
|
e7aa7b5aac
|
Add disable plugin dialog
|
2020-02-13 13:19:36 +02:00 |
|
veliymolfar
|
44ccddc3dc
|
Merge remote-tracking branch 'origin/exp_imp_profile_with_features' into import_screen
# Conflicts:
# OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
|
2020-02-13 10:20:15 +02:00 |
|
veliymolfar
|
60ed62e022
|
Merge remote-tracking branch 'origin/master' into import_screen
|
2020-02-13 10:12:08 +02:00 |
|
verdulo
|
a96f687c04
|
Update strings.xml
|
2020-02-13 00:07:51 +01:00 |
|
MadWasp79
|
6069ee0a38
|
Merge branch 'master' into straight_to
|
2020-02-12 22:05:04 +02:00 |
|
MadWasp79
|
989f118fb6
|
add setting for min recaclulation distance for Straight line routing
|
2020-02-12 21:43:20 +02:00 |
|
Victor Shcherb
|
b98d76fd25
|
Fix #7654 Add destination: Sort Favorites #7654
|
2020-02-12 19:18:22 +01:00 |
|
Vitaliy
|
73eed6b5a8
|
Combine menu titles from string resources
|
2020-02-12 19:54:54 +02:00 |
|
veliymolfar
|
a4d31c18d5
|
complex button / import layouts
|
2020-02-12 18:54:25 +02:00 |
|
veliymolfar
|
03dcb4facd
|
Merge remote-tracking branch 'origin/master' into import_screen
|
2020-02-12 16:36:39 +02:00 |
|
vshcherb
|
6b0595f6a0
|
Merge branch 'master' into straight_to
|
2020-02-11 19:28:14 +01:00 |
|
veliymolfar
|
4d57312c47
|
import screen initial commit
|
2020-02-11 18:51:29 +02:00 |
|
Dima-1
|
ebc25edaed
|
Fix #7694 dismiss the recorded track without saving.
|
2020-02-11 15:17:26 +02:00 |
|
MadWasp79
|
39e6132d83
|
Merge branch 'master' into straight_to
|
2020-02-11 13:02:27 +02:00 |
|
MadWasp79
|
b39612f985
|
Merge branch 'master' into straight_to
|
2020-02-11 11:18:37 +02:00 |
|
Dmitry
|
4b2f0cf266
|
Added information about new release 3.6
|
2020-02-10 16:16:35 +02:00 |
|
Dima-1
|
4f33c0d70e
|
Fix #7747 Add "Copy coordinates" into Share dialog.
|
2020-02-10 11:41:38 +02:00 |
|
veliymolfar
|
99a64eaa7b
|
Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features
|
2020-02-10 10:31:38 +02:00 |
|
sonora
|
fd69895d89
|
Remove obsolete string
|
2020-02-09 15:53:01 +01:00 |
|
Nazar-Kutz
|
3b4174cc9f
|
remove incorrect string translations
|
2020-02-06 16:07:17 +02:00 |
|
Nazar-Kutz
|
0d14e5dc57
|
Fix Configure POI Search categories
|
2020-02-06 15:47:50 +02:00 |
|
Nazar-Kutz
|
0c14de0e23
|
Fix #8034 (Option: for keep screen on or not)
|
2020-02-06 10:24:35 +02:00 |
|
veliymolfar
|
5f4285fe26
|
Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features
|
2020-02-05 17:12:59 +02:00 |
|
veliymolfar
|
531abc8e98
|
Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features
|
2020-02-04 12:02:35 +02:00 |
|
Vitaliy
|
d463f715f5
|
Merge branch 'master' of https://github.com/osmandapp/Osmand into prefs_screens_improvements
# Conflicts:
# OsmAnd/res/values/strings.xml
|
2020-02-04 09:26:21 +02:00 |
|
Vitaliy
|
871717daac
|
Add pref warning for system accessibility pref
|
2020-02-03 17:36:50 +02:00 |
|
Victor Shcherb
|
1249987391
|
Rename translation
|
2020-02-03 15:36:25 +01:00 |
|