Commit graph

4315 commits

Author SHA1 Message Date
Yaron Shahrabani
aaa917693d
Typo fix
prexif -> prefix
2020-03-06 16:50:08 +02:00
Vitaliy
c921377c2a Merge branch 'master' into restore_custom_modes
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
2020-03-05 11:00:37 +02:00
xmd5a
30d9e5ea55 Fix 2020-03-04 11:26:40 +03:00
xmd5a
f648eaa7b6 Add phrases 2020-03-04 11:20:41 +03:00
xmd5a
bd880f088e Add phrases 2020-03-04 11:04:12 +03:00
Vitaliy
ca742998dc Update restore and reset dialog UI 2020-03-03 21:45:43 +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
29aa173949 import ui fix 2020-02-28 16:14:07 +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
ff570d4b81 collapsing toolbar 2020-02-24 16:34:05 +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
13d47b2ed5
Merge pull request #8495 from osmandapp/straight_to
settings cleaning
2020-02-18 16:19:39 +01: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
xmd5a
02d034a723 Update phrases 2020-02-18 14:05:28 +03: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
max-klaus
8cf98181da Added AV widget customization to configure screen 2020-02-17 19:22:35 +03: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