Commit graph

62444 commits

Author SHA1 Message Date
Victor Shcherb
efef79d723 Merge branch 'r3.7' of github.com:osmandapp/Osmand into r3.7
Conflicts:
	OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
2020-06-05 17:13:26 +02:00
Victor Shcherb
8f1f9521f1 Remove unnecessary fields 2020-06-05 17:12:54 +02:00
max-klaus
40a1a6fb64
Merge pull request #9155 from osmandapp/searchRefactor
Fix show poi on map (search). Fix compilation.
2020-06-05 17:56:36 +03:00
max-klaus
4b45f3a43e
Merge branch 'r3.7' into searchRefactor 2020-06-05 17:56:27 +03:00
vshcherb
79b5b9bf08
Merge pull request #9154 from osmandapp/minor_fixes
Fix possible terrain db error
2020-06-05 16:52:13 +02:00
max-klaus
629fa232c9 Fix show poi on map (search). Fix compilation. 2020-06-05 17:22:02 +03:00
Vitaliy
dea014a98b Fix possible SQLiteException 2020-06-05 16:49:15 +03:00
Victor Shcherb
01ad124049 Fix concurrent modification exception 2020-06-05 13:39:07 +02:00
vshcherb
eabb67813c
Merge pull request #9152 from osmandapp/minor_fixes
Fix several possible errors
2020-06-05 12:59:05 +02:00
Vitaliy
06c43fdef6 Fix several possible errors 2020-06-05 13:31:17 +03:00
Victor Shcherb
ca69159332 Add fuel test 2020-06-04 16:46:52 +02:00
vshcherb
1c15cd5797
Merge pull request #9123 from osmandapp/Vechicle_pref_numeric_dialog
Vechicle pref numeric dialog
2020-06-04 16:15:31 +02:00
vshcherb
e28672a4cb
Merge pull request #9134 from osmandapp/fix_osf_export
Fix osf export
2020-06-04 16:11:36 +02:00
Victor Shcherb
ac7e1d4436 Fix compilation 2020-06-04 16:07:38 +02:00
Victor Shcherb
a2c04cd48a Fix compilation 2020-06-04 16:02:39 +02:00
Vitaliy
f3b64d3d9e Change action description 2020-06-04 17:00:10 +03:00
vshcherb
b035c7cb04
Merge pull request #9121 from osmandapp/searchRefactor
Search refactor
2020-06-04 15:56:54 +02:00
vshcherb
3ccb9bc037
Merge branch 'r3.7' into searchRefactor 2020-06-04 15:56:44 +02:00
Victor Shcherb
84c7fd425b Fix tests 2020-06-04 15:55:46 +02:00
Victor Shcherb
96674b5fd3 Fix tests 2020-06-04 15:33:52 +02:00
Victor Shcherb
3c9d940fbb Fix spring street 2020-06-04 14:47:59 +02:00
vshcherb
1e06372fe9
Merge pull request #9143 from osmandapp/text_scale
Fix white points
2020-06-04 12:32:30 +02:00
Dima-1
1f011927cb fix white point 2020-06-04 13:30:07 +03:00
Vitaliy
b9083a384b Fix osf export to google drive 2020-06-03 22:09:13 +03:00
Dima-1
4d590d9b16 Remove unnecessary file 2020-06-03 19:49:21 +03:00
Dima-1
fc5ab038c7 Fix review 2020-06-03 18:21:36 +03:00
vshcherb
a501428186
Merge pull request #9132 from osmandapp/fix_9085
Fix_9085
2020-06-03 16:56:03 +02:00
Vitaliy
3a16a63520 Fix #9085 2020-06-03 17:48:21 +03:00
Victor Shcherb
811e6ebbf9 Fix tests 2020-06-03 16:21:29 +02:00
Victor Shcherb
b755d328e9 Improve tests 2020-06-03 16:08:57 +02:00
max-klaus
4a803afc3b Added multiple search tests 2020-06-03 17:03:21 +03:00
vshcherb
436b7e685e
Merge pull request #9130 from osmandapp/fix_turn_screen_on
Fix power button for keep screen on
2020-06-03 15:44:23 +02:00
Vitaliy
c69e1104c3 Fix power button for keep screen on 2020-06-03 16:41:51 +03:00
vshcherb
a11f32be2e
Merge pull request #9129 from osmandapp/fix_turn_screen_on
Fix turn screen on
2020-06-03 15:19:03 +02:00
Vitaliy
96bccff515 Remove unnecessary changes for power button 2020-06-03 16:09:05 +03:00
Dima-1
e4cb37aca3 Fix review 2020-06-03 15:58:40 +03:00
Vitaliy
b92c91c31e Remove unnecessary changes 2020-06-03 15:53:01 +03:00
Vitaliy
1a4970fbbc Fix turn screen on 2020-06-03 15:43:53 +03:00
Dima-1
4030992ec2 Fix review 2020-06-03 15:43:48 +03:00
Victor Shcherb
99aa47d5af Improve tests 2020-06-03 13:43:27 +02:00
Victor Shcherb
378f1a66d0 Merge branch 'searchRefactor' of github.com:osmandapp/Osmand into searchRefactor 2020-06-03 13:41:58 +02:00
Victor Shcherb
1592c46979 Improve tests 2020-06-03 13:41:50 +02:00
max-klaus
c07d101b8e Merge branch 'searchRefactor' of github.com:osmandapp/Osmand into searchRefactor 2020-06-03 14:36:23 +03:00
max-klaus
5fc0c531dc Fix burger_king results 2020-06-03 14:35:28 +03:00
Victor Shcherb
63f9fe8033 Revert test location 2020-06-03 13:32:20 +02:00
Victor Shcherb
6dde05d297 Fix compilation 2020-06-03 12:34:07 +02:00
Vitaliy
c914cdb556
Merge pull request #9128 from osmandapp/WikipediaBottomSheet
Fix Wikipedia languages bottom sheet
2020-06-03 12:34:01 +03:00
Nazar-Kutz
fe844bd9bd Fix Wikipedia languages bottom sheet 2020-06-03 11:27:33 +03:00
Victor Shcherb
823506103a Fix test 2020-06-02 23:00:40 +02:00
Victor Shcherb
bbcee5bc1d Fix test 2020-06-02 22:57:43 +02:00