Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #744 from mapbox/merge-roads | John Firebaugh | 2015-01-14 | 1 | -0/+20 |
|\ | | | | | merge adjacent roads with the same text for labeling | ||||
| * | port tests for mergeLines | Ansis Brammanis | 2015-01-13 | 1 | -0/+20 |
| | | | | | | | | js: 867b7f4be01126663df609756049515a41e700d1 | ||||
* | | include sqlite3_static_libs in linker flags | Mike Morris | 2015-01-13 | 1 | -0/+1 |
|/ | |||||
* | add missing gyp file | Konstantin Käfer | 2014-12-08 | 1 | -0/+1 |
| | |||||
* | make most headers private | Konstantin Käfer | 2014-12-04 | 1 | -1/+11 |
| | |||||
* | simplify image_readers creation implementation | artemp | 2014-11-19 | 1 | -1/+0 |
| | | | | | * remove static callbacks registration * link png_reader/jpeg_reader into mbgl-linux lib | ||||
* | Merge branch 'master' into image-readers | artemp | 2014-11-13 | 1 | -1/+11 |
|\ | |||||
| * | add boost headers to cflags_cc for text_conversions test | Mike Morris | 2014-11-07 | 1 | -1/+11 |
| | | |||||
* | | fix tests for linux (todo - find a better way to run 'linux' tests on 'osx') | artemp | 2014-11-07 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #540 from mapbox/test-http | Konstantin Käfer | 2014-11-04 | 1 | -2/+0 |
|\ | | | | | Run tests using HTTP requests | ||||
| * | Run tests using http requests | Konstantin Käfer | 2014-11-04 | 1 | -2/+0 |
| | | | | | | | | | | | | We now start a local HTTP server on port 2900 that serves the test fixtures. This is the same port we also use in the JS test suite fixes #532 | ||||
* | | format | artemp | 2014-11-04 | 1 | -1/+1 |
| | | |||||
* | | add basic toupper/tolower text conversions tests #309 | artemp | 2014-11-04 | 1 | -2/+21 |
|/ | |||||
* | Remove unused | John Firebaugh | 2014-11-01 | 1 | -2/+1 |
| | |||||
* | Merge branch 'master' into platform-image | Konstantin Käfer | 2014-10-30 | 1 | -8/+8 |
|\ | | | | | | | | | Conflicts: gyp/install.gypi | ||||
| * | attemp to fix #525 | Dane Springmeyer | 2014-10-30 | 1 | -8/+8 |
| | | |||||
* | | use more modern libpng version instead of the system-provided one and fix ↵ | Konstantin Käfer | 2014-10-30 | 1 | -1/+1 |
|/ | | | | compile errors | ||||
* | remove regex/boost regex usage | Konstantin Käfer | 2014-10-30 | 1 | -5/+0 |
| | |||||
* | fix xtest target - closes #520 - longer term fix at #519 | Dane Springmeyer | 2014-10-30 | 1 | -15/+62 |
| | |||||
* | use stable cross-generator direction for referencing standalone lib + other ↵ | Dane Springmeyer | 2014-10-29 | 1 | -2/+0 |
| | | | | minor fixups | ||||
* | linux test build fixes | Dane Springmeyer | 2014-10-29 | 1 | -2/+8 |
| | |||||
* | fix tests | Dane Springmeyer | 2014-10-29 | 1 | -9/+19 |
| | |||||
* | rename mbgl to mbgl-core | Konstantin Käfer | 2014-10-29 | 1 | -9/+9 |
| | |||||
* | gyp fixes | Konstantin Käfer | 2014-10-28 | 1 | -4/+3 |
| | |||||
* | allow installing the library | Konstantin Käfer | 2014-10-27 | 1 | -10/+10 |
| | |||||
* | make tests work | Konstantin Käfer | 2014-10-24 | 1 | -183/+137 |
| | |||||
* | Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring | Konstantin Käfer | 2014-10-24 | 1 | -0/+2 |
|\ | | | | | | | | | | | Conflicts: Makefile ios/mapbox-gl-cocoa | ||||
| * | Merge branch 'libuv-0.10-headless-display' into mason | Konstantin Käfer | 2014-10-22 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/http_request_baton_curl.cpp include/mbgl/map/map.hpp include/mbgl/util/uv_detail.hpp scripts/travis_before_install.sh setup-libraries.sh src/map/map.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/util/uv-messenger.c | ||||
| | * | break out HeadlessDisplay from HeadlessView, ref #478 | Mike Morris | 2014-10-03 | 1 | -0/+2 |
| | | | |||||
* | | | restructure gyp files | Konstantin Käfer | 2014-10-24 | 1 | -1/+0 |
|/ / | |||||
* | | fix compile warnings | Konstantin Käfer | 2014-10-22 | 1 | -32/+0 |
| | | |||||
* | | use glfw3 libs instead of manually linking OpenGL frameworks on OS X | Konstantin Käfer | 2014-10-22 | 1 | -2/+2 |
|/ | | | | [skip ci] | ||||
* | add uppercase/lowercase symbols to headless test | Konstantin Käfer | 2014-08-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into style-parser-test | Konstantin Käfer | 2014-08-12 | 1 | -1/+0 |
|\ | | | | | | | | | Conflicts: mapboxgl.gyp | ||||
| * | fix gyp builds | Konstantin Käfer | 2014-08-12 | 1 | -1/+0 |
| | | |||||
* | | build fixes | Mike Morris | 2014-08-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into style-parser-test | Mike Morris | 2014-08-11 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: bin/build-style.js bin/default.style.json mapboxgl.gyp src/style/style_parser.cpp test/test.gyp | ||||
| * | fix test gyp file | Konstantin Käfer | 2014-08-11 | 1 | -1/+1 |
| | | |||||
* | | migrate style_parser tests to use info and style json fixtures | Mike Morris | 2014-07-18 | 1 | -5/+5 |
| | | |||||
* | | split stylesheet fixtures into separate gyp action | Mike Morris | 2014-07-17 | 1 | -9/+10 |
| | | |||||
* | | Merge branch 'master' into fuzz-pipe | Mike Morris | 2014-07-17 | 1 | -9/+26 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: bin/package.json src/style/style_parser.cpp test/fixtures/fixture_log.cpp test/test.gyp | ||||
| * | rename a few things from mbgl => mapboxgl | Konstantin Käfer | 2014-07-16 | 1 | -9/+9 |
| | | |||||
| * | rename llmr => mbgl | Konstantin Käfer | 2014-07-16 | 1 | -9/+9 |
| | | |||||
| * | separate comparisons and expressions | Konstantin Käfer | 2014-07-16 | 1 | -4/+4 |
| | | |||||
| * | update value semanatics to be closer to js and add filter expression tests | Konstantin Käfer | 2014-07-16 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'master' into fuzz-pipe | Mike Morris | 2014-07-15 | 1 | -0/+17 |
|\ \ | |/ | | | | | | | Conflicts: test/test.gyp | ||||
| * | add enum class to unify parsing/stringification | Konstantin Käfer | 2014-07-14 | 1 | -0/+17 |
| | | |||||
* | | hook up style_parser to new log backend | Mike Morris | 2014-07-14 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'stylesource' into fuzz-pipe | Mike Morris | 2014-07-11 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | add logging facility and check logs in tests | Konstantin Käfer | 2014-07-11 | 1 | -0/+2 |
| | |