pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity
20483 commits 374 branches 100 tags 7.7 GiB
Commit graph

20483 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergey Yershov
5aa924617b Merge pull request #4438 from therearesomewhocallmetim/strings-txt-filter 
Strings cleaner
 2016-10-10 16:34:57 +03:00
Sergey Yershov
43dce88ec6 Merge pull request #4152 from mgsergio/booking-workflow 
[booking] Booking workflow
 2016-10-10 16:30:04 +03:00
Sergey Magidovich
35a73ff37c Code review. 2016-10-10 15:58:59 +03:00
Timofey
01adfe0c0c Strings cleaner 
And modifications to find_untranslated_strings to work with it.
 2016-10-10 15:54:58 +03:00
alexzatsepin
f9f2c21a46 Merge pull request #4469 from therearesomewhocallmetim/android_duplicate_key_fix 
Android duplicate key fix
 2016-10-10 15:33:49 +03:00
Timofey
dbf79c9702 Ran the script. 2016-10-10 15:22:15 +03:00
Timofey
d485f5904c Fixes android compilation problem due to duplicate key. 2016-10-10 15:21:38 +03:00
Roman Kuznetsov
dd99934645 Merge pull request #4468 from darina/auto-zoom-unknown 
Do not auto scale if speed is unknown.
 2016-10-10 13:55:16 +03:00
Daria Volvenkova
70580ead59 Do not auto scale if speed is unknown. 2016-10-10 13:44:17 +03:00
therearesomewhocallmetim
518011dd5f Merge pull request #4467 from Mapotempo/mt-fr-spelling 
French spelling correction
 2016-10-10 14:29:41 +04:00
FILLAU Jean-Maxime
41843df3d5 applying tools/unix/generate_localizations.sh 2016-10-10 11:22:26 +02:00
FILLAU Jean-Maxime
9eb246f5b0 correcting spelling for Fr, in string.txt. 
Signed-off-by: FILLAU Jean-Maxime <jean-maxime.fillau@mapotempo.com>
 2016-10-10 11:18:36 +02:00
mpimenov
75b38035b7 Merge pull request #4448 from ForkWithMe/FAQ_update_October 
FAQ Update
 2016-10-07 18:38:09 +03:00
Marat
b65c1bc63a Minor corrections 2: the return of minor corrections. 2016-10-07 18:16:48 +03:00
Marat
2ec6cbcfb7 Minor corrections. 2016-10-07 17:08:08 +03:00
Sergey Yershov
1ad2298aa6 Merge pull request #4450 from therearesomewhocallmetim/cmake_stats 
Cmake stats and editor
 2016-10-07 16:42:21 +03:00
Ilya Zverev
142f091bd3 Merge pull request #4443 from therearesomewhocallmetim/geochat_strings 
[DNM] Added string stubs.
 2016-10-07 16:27:05 +04:00
Timofey
878c996d0d Added string stubs. 2016-10-07 15:21:53 +03:00
Timofey
7bd0be0412 Added editor tests 2016-10-07 13:34:33 +03:00
Marat
324839b5b5 Corrections and improvements. 2016-10-07 13:30:44 +03:00
Timofey
7ca99fa056 Making stats compile 2016-10-07 11:53:57 +03:00
Marat
66637e4b02 Correction of mistakes. Replaced old data. 2016-10-06 18:15:13 +03:00
Sergey Magidovich
29cbd04e32 Complete opentable intergration into data generatrion. 2016-10-06 15:41:17 +03:00
Sergey Magidovich
51ada39cfc Adjust classificator theshold for opentable. 2016-10-06 15:41:17 +03:00
Sergey Magidovich
0caaaa0ad0 Fix booking quality check. Add sample generation. Allow opentable data. 2016-10-06 15:41:17 +03:00
Sergey Magidovich
964eb58b81 Refactor booking (now sponsored) datase. Allow new datasets. 2016-10-06 15:41:16 +03:00
Sergey Magidovich
d763f66c0d Opentable downloader. 2016-10-06 15:41:16 +03:00
Sergey Magidovich
22d138efd4 Switch from inheritance to templates. 2016-10-06 15:41:16 +03:00
Sergey Magidovich
75afc71cf8 Add AggregatingSponsoredDataset to rule them all. 2016-10-06 15:41:16 +03:00
Sergey Magidovich
389ddf670f Add SponsoredDataset as an abstruction. 2016-10-06 15:41:16 +03:00
Sergey Magidovich
78ea6a4038 Use NewType for bookingid. 2016-10-06 15:41:16 +03:00
Daria Volvenkova
569ea6f284 Merge pull request #4441 from rokuz/traffic-renderer 
Added traffic renderer
 2016-10-06 15:13:07 +03:00
r.kuznetsov
9d39fd37c7 Review fixes 2016-10-06 15:11:23 +03:00
Roman Kuznetsov
5daf456e7a Merge pull request #4446 from darina/visible-viewport-android-fix 
Setting visible viewport on the drape engine creation.
 2016-10-06 14:30:55 +03:00
Daria Volvenkova
d9bfed5021 Setting visible viewport on the drape engine creation. 2016-10-06 14:29:15 +03:00
Sergey Yershov
09566c5ca7 Merge pull request #4445 from ygorshenin/accelerate-locality-finder 
[search] Accelerated locality finder.
 2016-10-06 14:10:40 +03:00
Yuri Gorshenin
c11fe50150 Review fixes. 2016-10-06 14:09:48 +03:00
Yuri Gorshenin
7b48331e44 [search] Accelerated locality finder. 2016-10-06 13:13:48 +03:00
burivuh
d487f11baa Merge pull request #4367 from goblinr/MAPSME-1-external-place-page-booking 
[android] place page booking
 2016-10-05 20:22:18 +03:00
Sergey Yershov
e75d76e880 Merge pull request #4410 from therearesomewhocallmetim/decimate_spaces 
[cmake] Decimated spaces in the CMake files.
 2016-10-05 17:37:12 +03:00
Timofey
bd0ebdcdad Cleaned up variables in conditionals. 2016-10-05 14:26:21 +03:00
Roman Romanov
e666c1dad9 [android] Review fixes 2016-10-05 15:04:32 +04:00
r.kuznetsov
6dc03b1114 Added traffic renderer 2016-10-05 13:52:06 +03:00
Roman Romanov
4931943b57 [android] Fix crash on tablet devices. 2016-10-05 13:34:55 +04:00
burivuh
14789bc670 Merge pull request #4396 from trashkalmar/downloader-ads 
[android] add: Ads in downloader.
 2016-10-05 08:36:32 +03:00
Ilya Zverev
79c1e359be Merge pull request #4437 from syershov/fix-osrm-build 
Fix OSRM build on macOS
 2016-10-04 19:12:47 +04:00
Sergey Yershov
94dca03290 Review fix 2016-10-04 18:11:52 +03:00
mpimenov
976038d9cc Merge pull request #4228 from therearesomewhocallmetim/proofread_strs 
Strings after proof reading in Alconost
 2016-10-04 15:12:16 +03:00
Timofey
3121969035 Changed hours when closed to non-business hours 2016-10-04 14:55:19 +03:00
Timofey
117816a3ed Decimated spaces in the CMake files. 2016-10-04 14:32:46 +03:00