summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bump podspec to 0.2.15ios-v0.2.15Justin R. Miller2015-04-231-1/+1
* Merge pull request #1297 from mapbox/1ec5-strong-selfMinh Nguyễn2015-04-221-20/+26
|\
| * Merge branch 'master' into 1ec5-strong-selfMinh Nguyễn2015-04-2239-385/+454
| |\
| * \ Merge branch 'master' into 1ec5-strong-selfMinh Nguyễn2015-04-2252-506/+506
| |\ \
| * | | Use `strongSelf` inside blocksMinh Nguyễn2015-04-201-22/+22
| * | | weakSelf needs strongSelfMinh Nguyễn2015-04-181-0/+9
* | | | Merge pull request #1324 from mapbox/normalize-cacheJustin R. Miller2015-04-222-5/+10
|\ \ \ \
| * | | | fixes #1308: normalize tile memory cache keys & allow dupe insertsJustin R. Miller2015-04-222-5/+10
* | | | | Merge pull request #1323 from mapbox/1315-python-styleJohn Firebaugh2015-04-221-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Correct indentation — #1315Jason Wray2015-04-221-2/+2
| |/ / /
* | | | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-nativePeter Liu2015-04-2216-53/+125
|\ \ \ \ | |/ / /
| * | | Revert "build on trusty"John Firebaugh2015-04-2238-385/+454
| | |/ | |/|
| * | Merge pull request #1322 from mapbox/1ec5-orientation-1313Minh Nguyễn2015-04-221-0/+2
| |\ \
| | * | Constrain user dot to superview marginsMinh Nguyễn2015-04-211-0/+2
| * | | Merge pull request #1321 from mapbox/1166-nsurlsessionBrad Leege2015-04-212-43/+46
| |\ \ \ | | |/ / | |/| |
| | * | #1166 - Cleaning up logs and old NSURLConnection codeBrad Leege2015-04-211-58/+1
| | * | #1166 - Initial conversion from NSURLConnection to NSURLSessionBrad Leege2015-04-212-4/+64
| |/ /
| * | Merge pull request #1310 from mapbox/1306-geotrust-sslpinBrad Leege2015-04-213-6/+72
| |\ \
| | * | #1306 - Removing kSecTrustResultConfirm as it's deprecatedBrad Leege2015-04-211-2/+0
| | * | #1306 - Moving local geoTrustCert to one time setup and cache in immutable NS...Brad Leege2015-04-211-15/+22
| | * | #1306 - Renaming certificate to include geotrust name for easier trackingBrad Leege2015-04-202-6/+1
| | * | #1306 - Moving api_mapbox_com.der to iOS Resources directory so that it can b...Brad Leege2015-04-203-4/+16
| | * | #1306 - Explicitly scheduling NSURLConnections in mainRunLoop so that delegat...Brad Leege2015-04-201-2/+3
| | * | #1306 - Trying strongSelf / weakSelf pattern for delegateBrad Leege2015-04-201-3/+6
| | * | #1306 - Adding api_mapbox_com.der (public key) and nsurlconnection checking i...Brad Leege2015-04-204-5/+55
| * | | copy the styles to the correct location for iOS buildsKonstantin Käfer2015-04-211-1/+1
| * | | Use a promise rather than async danceJohn Firebaugh2015-04-201-25/+8
| |/ /
| * | Merge pull request #1304 from mapbox/1303-battery-levelsBrad Leege2015-04-201-1/+4
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into 1303-battery-levelsBrad Leege2015-04-2048-474/+420
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1245 from mapbox/1245-adjust-exposed-method-array-sizeKonstantin Käfer2015-04-201-4/+2
| |\ \ \
| | * | | [android] never pass garbage info to RegisterNatives()Konstantin Käfer2015-04-201-4/+2
| * | | | bump masonKonstantin Käfer2015-04-201-0/+0
| |/ / /
| * | | Merge pull request #1301 from mapbox/travis-trustyKonstantin Käfer2015-04-2038-454/+385
| |\ \ \
| | * | | build on trustyKonstantin Käfer2015-04-2038-454/+385
| |/ / /
| * | | Merge pull request #1295 from mapbox/1199-wheeKonstantin Käfer2015-04-202-6/+22
| |\ \ \
| | * | | Ensure correct spin directionMinh Nguyễn2015-04-182-6/+22
| | | |/ | | |/|
| * | | Merge pull request #1290 from mapbox/1290-static-to-stillKonstantin Käfer2015-04-206-9/+9
| |\ \ \
| | * | | rename Mode::Static => Mode::StillKonstantin Käfer2015-04-176-9/+9
| * | | | Merge pull request #1207 from mapbox/fix-linux-app-on-osx-hostKonstantin Käfer2015-04-202-1/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | default to CGL on OS XKonstantin Käfer2015-04-201-0/+1
| | * | | fix style copying for linux app on osx - refs #511 / e69beba4d1Dane Springmeyer2015-04-201-1/+1
| |/ / /
| | | * #1303 - Enabling Battery Monitoring for app. Formatting battery level to int...Brad Leege2015-04-201-1/+4
| | |/ | |/|
| * | [publish ios-v0.2.14]Brad Leege2015-04-170-0/+0
| * | Bumping Podspec to 0.2.14ios-v0.2.14Brad Leege2015-04-171-1/+1
* | | update Emerald and Streets stylesPeter Liu2015-04-221-0/+0
|/ /
* | remove noise on emeraldPeter Liu2015-04-171-0/+0
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeNicki Dlugash2015-04-1725-158/+446
|\ \ | |/
| * Merge pull request #1272 from mapbox/1272-render-still-images-on-threadKonstantin Käfer2015-04-1725-158/+446
| |\
| | * make the request header public as the node module requires itKonstantin Käfer2015-04-171-0/+0
| | * don't record Debug events to log observersKonstantin Käfer2015-04-171-1/+2