Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on May 22, 2012
Alan Palazzolo Added JSONP support to API calls. 0d05ac2
Commits on Jun 20, 2012
@ansis ansis Refresh map and zoom display after settings change 855b4f7
AJ Ashton Add ability to toggle layer visibility fe269fb
@ansis ansis Move visibility toggle control d7c1d43
Commits on Jun 24, 2012
@springmeyer springmeyer add now about the upcoming release supporting zero for grid primary k…
…ey values (e.g. for sqlite)
ddfd960
Commits on Jun 25, 2012
@springmeyer springmeyer remove mapnik-reference, which will be pulled in by carto d413b4c
@springmeyer springmeyer add note to changelog about support for 'lng' field for csv files in …
…upcoming release
eace247
AJ Ashton Prefer implied layer status=on. Only explicitly turn off. b55e500
AJ Ashton Improved layer visibility icon 3192a8f
Commits on Jun 26, 2012
@ansis ansis Added zooming to layer extent 031aa6e
@ansis ansis Move map out of plugins f88716e
@ansis ansis Extent zooming works with old layers ad4cf24
@ansis ansis Merge branch 'master' into hide-layers d9bab37
@ansis ansis New inspect features icon 343d515
@ansis ansis Merge branch 'master' into zoom-to-extent 2c4fb2b
@ansis ansis Pass SRS to datasource when inspecting features dd4eb9a
@springmeyer springmeyer Merge branch 'settings-refresh-map' of github.com:mapbox/tilemill e034493
@springmeyer springmeyer Merge pull request #1532 from mapbox/scale-factor
Add scale factor and metatile size settings
f5198b6
@springmeyer springmeyer Merge branch 'master' of github.com:mapbox/tilemill into zoom-to-extent 3282ffe
@springmeyer springmeyer clip extents to resonable long/lat values for MM to use for mercator map 8f2af34
@springmeyer springmeyer Merge pull request #1537 from mapbox/zoom-to-extent
Zoom to layer extent
6e7f59b
@springmeyer springmeyer update tile test which likely changed due to mapnik compositing work 3a8934e
@springmeyer springmeyer add difflet as test dependency and fixup the tests - should all be pa…
…ssing again after zoom-to-extent merge
49e8afe
Commits on Jun 27, 2012
@ansis ansis Merge branch 'master' into hide-layers
Conflicts:
	assets/images/sprite.png
	assets/images/sprite.svg
	templates/ProjectLayer._
	views/Layers.bones
3108ee6
@ansis ansis Pass SRS when fetching datasource for interactivity 79013df
@ansis ansis Update Wax c05d4bd
@ansis ansis Add extent zooming and interactivity fix to changelog b830940
@springmeyer springmeyer jump back on tagged versions ae738f6
@ansis ansis Location interaction, opens in new tab.
Does not work in gtk webview due to a signal bug.
Discussion in #1502
5c6d385
Commits on Jun 28, 2012
@tmcw tmcw Correct url in package.json 83d4d8f
@ansis ansis Non-blocking update checking on client startup 8c7ea97
@ansis ansis Add startup hang bug fix to changelog 5e82711
@ansis ansis Disable interactivity after deleting layer bbc2cfd
@springmeyer springmeyer Merge pull request #1541 from mapbox/hide-layers
Add ability to hide layers
20b6321
@springmeyer springmeyer Merge pull request #1545 from mapbox/disable-interactivity-fix
Disable interactivity after deleting layer
f44cf68
@ansis ansis Empty template when disabling interaction 558283f
@springmeyer springmeyer Merge pull request #1542 from mapbox/location-fix
Adds location interaction, opens in new tab.
2352137
@springmeyer springmeyer Merge pull request #1547 from mapbox/gridjson-request-fix
Empty template when disabling interaction
105bf1a
@springmeyer springmeyer new wax tag @6.3.1 to fully fix #1398 (refs #1547) d41e5df
@springmeyer springmeyer Merge branch 'master' of github.com:mapbox/tilemill 0c7a2de
@springmeyer springmeyer add more fancy diffing to test to help show failures more clearly fe1220c
@springmeyer springmeyer add layer viz to changelog bb1a685
@springmeyer springmeyer Merge pull request #1543 from mapbox/npm-request-fix2
Non-blocking update checking on client startup
10c6c10
@springmeyer springmeyer merge d0f1ce5
Commits on Jun 29, 2012
@springmeyer springmeyer remove environment settings for mapnik - now handled by node-mapnik c…
…ustomization - refs #1390
323d09c
@springmeyer springmeyer adapt windows to new path for setting environment settings for mapnik…
… - closes #1390
999cef9
@springmeyer springmeyer Merge pull request #1495 from zzolo/pull-request-api-jsonp
Added JSONP support to API calls.
5021d60
@springmeyer springmeyer use latest node-mapnik and node-sqlite3 (which are compatible both wi…
…th node v6 and node v8)
8a5eb25
@tmcw tmcw Push Modest Maps to 3.0.0, fixes #1548 9a9d4f8
@springmeyer springmeyer use carto 0.8.1 with new support for backwards compatible expression …
…types and leveraging new mapnik-reference updated to work with latest mapnik that supports expressions for marker-width and marker-height - closes #1324
7a09757
@springmeyer springmeyer update stealth changelog f9c67f8
@springmeyer springmeyer update stealth changelog 6eaa052
@incanus incanus fixes for project open in Xcode 4.5b 448384b
@incanus incanus refs #1503: conditionally set scroll elasticity per platform 6172d39
@incanus incanus Merge branch 'master' of github.com:mapbox/tilemill b416ddb
Commits on Jun 30, 2012
@ansis ansis Add http proxy to config e68b186
@ansis ansis Uploading tiles respects http proxy setting 5379498
Commits on Jul 01, 2012
@ansis ansis New npm and its requests respect proxy setting b7c7137
@ansis ansis Downloading data now respects proxy setting 3c654f2
@ansis ansis Update proxy setting source for uploads b5dbae7
@ansis ansis Update proxy setting source for npm requests 2b10e7e
@ansis ansis Add support for proxy with auth for uploading aaf4b26
@ansis ansis Merge master into http-proxy
Conflicts:
	package.json
06613c4
@ansis ansis Browsing MapBox geodata now respects proxy setting 57d8d96
@ansis ansis Fix padding in layers list 9a45124
Commits on Jul 02, 2012
@ansis ansis Silence npm complaints about undefined proxy e6e6779
@ansis ansis Skip hidden dirs when loading core plugins
Fixes #1246
89ff175
Commits on Jul 03, 2012
@ansis ansis Add ability to remove advanced layer settings 26eae72
@springmeyer springmeyer Merge pull request #1557 from mapbox/skip-hidden-dirs
Skip hidden dirs when loading plugins
65db943
@springmeyer springmeyer Merge pull request #1558 from mapbox/advanced-layer-settings
Add ability to remove advanced layer settings
9217785
@springmeyer springmeyer Merge pull request #1550 from mapbox/http-proxy
HTTP Proxy support
883a838
@springmeyer springmeyer update stealth changelog 33da3c4
Commits on Jul 04, 2012
@springmeyer springmeyer add millstone items to stealth changelog 1c6563d
@springmeyer springmeyer use at least millstone@0.5.2 4246074
@kkaefer kkaefer more retina support 7e3b5f8
@kkaefer kkaefer add scale parameter fbd3248
@kkaefer kkaefer resolve merge conflict e1f9e42