summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* drop unnecessary mason PATH and MASON_DIR exports from setup.shMike Morris2015-05-072-6/+0
* break out setup.sh from run.shMike Morris2015-05-0712-51/+47
* Merge pull request #1464 from mapbox/1ec5-type-inMinh Nguyễn2015-05-072-1/+12
|\
| * Added tests for 6292e95f80fa2e0a9a7aa4d4d4e320a207e78d27Minh Nguyễn2015-05-071-0/+7
| * Parse feature types in set filtersMinh Nguyễn2015-05-071-1/+5
* | Merge pull request #1459 from mapbox/remove_unused_methodThiago Marcos P. Santos2015-05-071-1/+0
|\ \
| * | Removed unused method from MapContextThiago Marcos P. Santos2015-05-071-1/+0
|/ /
* | Merge pull request #1443 from mapbox/style_changeThiago Marcos P. Santos2015-05-079-8/+111
|\ \
| * | change the window title to indicate the current styleKonstantin Käfer2015-05-074-2/+13
| * | add style cycling to Mac OS X app as wellKonstantin Käfer2015-05-072-1/+18
| * | Make all GLFWView attributes privateThiago Marcos P. Santos2015-05-073-7/+12
| * | Add style change functionality to the Linux test appThiago Marcos P. Santos2015-05-077-3/+73
|/ /
* | Merge pull request #1456 from mapbox/1456-copy-stylesKonstantin Käfer2015-05-072-14/+15
|\ \ | |/ |/|
| * on OS X, styles for the linux test app weren't bundled correctlyKonstantin Käfer2015-05-072-14/+15
|/
* [publish ios-v0.2.22]ios-v0.2.22Justin R. Miller2015-05-060-0/+0
* bump podspec to 0.2.22Justin R. Miller2015-05-061-1/+1
* Merge pull request #1451 from mapbox/more-ios-background-fixJustin R. Miller2015-05-061-18/+45
|\
| * fix lingering backgrounding crashes & add debug modeJustin R. Miller2015-05-061-18/+45
* | Disable iOS tests on Travis for nowJohn Firebaugh2015-05-061-1/+1
|/
* Merge pull request #1425 from mapbox/1ec5-analyzerMinh Nguyễn2015-05-064-29/+7
|\
| * Rolled back portions of 900d140f23b28c56ab01fc227b5cf74a71e81650 that should ...Minh Nguyễn2015-05-062-0/+4
| * Merge branch 'master' into 1ec5-analyzerMinh Nguyễn2015-05-0645-243/+725
| |\
| * | Fixed leaks of copied CF objectsMinh Nguyễn2015-05-051-1/+2
| * | Suppressed an uninitialized value warning from the static analyzerMinh Nguyễn2015-05-051-6/+3
| * | Fixed dead store analyzer warningsMinh Nguyễn2015-05-054-22/+0
| * | Fixed NSMutableString leakMinh Nguyễn2015-05-051-4/+2
* | | Reference safety for Worker after callbacksJohn Firebaugh2015-05-066-10/+96
* | | Merge pull request #1447 from mapbox/cocoapods-37-workaroundJustin R. Miller2015-05-062-1/+4
|\ \ \ | |_|/ |/| |
| * | refs #1426: add dummy source file to workaround CocoaPods 0.37.0 bugJustin R. Miller2015-05-062-1/+4
|/ /
* | Merge pull request #1441 from mapbox/android-studio-1.2Leith Bade2015-05-064-15/+15
|\ \
| * | Update to lastest Android SDKLeith Bade2015-05-064-15/+15
* | | iOS README clarificationsJustin R. Miller2015-05-051-3/+5
* | | add mention of CocoaPods to get ahead of releaseJustin R. Miller2015-05-052-1/+13
* | | clear location services prompt if neededJustin R. Miller2015-05-051-0/+2
* | | Merge branch 'refs/heads/reenable-headless'John Firebaugh2015-05-052-0/+2
|\ \ \
| * | | Revert test/suite submodule to intended hashJohn Firebaugh2015-05-051-0/+0
| * | | Revert "Disable headless tests temporarily"John Firebaugh2015-05-051-0/+2
* | | | Merge pull request #1432 from mapbox/fix-docs-packaging-private-headersJustin R. Miller2015-05-054-2/+5
|\ \ \ \
| * | | | update header pathJustin R. Miller2015-05-051-1/+1
| * | | | don't doc or package private headersJustin R. Miller2015-05-053-1/+4
| | |/ / | |/| |
* | | | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-nativePeter Liu2015-05-05257-3975/+13077
|\ \ \ \ | |/ / /
| * | | [publish ios-v0.2.21]Justin R. Miller2015-05-050-0/+0
| * | | bump podspec to 0.2.21ios-v0.2.21Justin R. Miller2015-05-051-1/+1
| |/ /
| * | Don't crash if ResourceLoader::_sprite is nullJohn Firebaugh2015-05-053-1/+26
| * | fixes #1391: install awscli for iOS deploysJustin R. Miller2015-05-051-0/+3
| * | no longer link iOS HTML docs since missing CSSJustin R. Miller2015-05-051-3/+0
| * | Merge pull request #1329 from mapbox/1225-start-tokenBrad Leege2015-05-058-16/+88
| |\ \
| | * | #1225 - Simplifying MGLAccountManager for initial setup and access to AccessT...Brad Leege2015-05-054-14/+18
| | * | Updating from masterBrad Leege2015-05-04230-4549/+4351
| | |\ \
| | * | | #1225 - Renaming getAccessToken method to sharedAccessToken to avoid any iOS ...Brad Leege2015-05-043-3/+3
View Lorry Controller Status