This is an automated email from the git hooks/post-receive script. ross-guest pushed a change to branch master in repository tilemill.
from f253018 Add a to-do list new 5f9fcf6 fix watch file, githubredir.debian.net seems down here new ade6efc Alter get-origi-source due to new tarball name upstream new 5081dfd Update To-do list after merging new upstream new a96c142 Imported Upstream version 0.10.1+ds1 new 5fc2e2f Imported Upstream version 0.10.1+ds1 new 7137c89 Merge tag 'upstream/0.10.1+ds1' The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 4 + .gitmodules | 6 - README.md | 42 +- _config.yml | 27 - assets/css/codemirror.css | 132 +++- assets/css/controls.css | 13 + assets/css/style.css | 63 +- assets/images/controls_2x.png | Bin 0 -> 740 bytes assets/images/favicon.ico | Bin 374 -> 22509 bytes assets/images/sprite.png | Bin 22963 -> 23456 bytes assets/images/sprite.svg | 46 +- assets/images/sprite_2x.png | Bin 0 -> 50837 bytes assets/images/tilemill_2x.png | Bin 0 -> 1327 bytes assets/js/codemirror.carto.complete.js | 6 +- assets/js/codemirror.carto.js | 9 +- commands/core.bones | 114 ++-- commands/export.bones | 473 +++++++++++---- commands/global.bones | 16 +- commands/start.bones | 83 ++- commands/tile.bones | 2 +- controllers/Router.bones | 68 ++- debian/README.Debian | 13 +- debian/changelog | 2 +- debian/rules | 30 +- debian/watch | 7 +- examples/open-streets-dc/.thumb.png | Bin 70237 -> 68203 bytes examples/open-streets-dc/highway.mss | 662 ++++++++------------- examples/open-streets-dc/images/water.png | Bin 0 -> 830 bytes examples/open-streets-dc/images/wood.png | Bin 0 -> 402 bytes examples/open-streets-dc/labels.mss | 72 +-- examples/open-streets-dc/layers/dc-coastline.dbf | Bin 0 -> 89 bytes examples/open-streets-dc/layers/dc-coastline.prj | 1 + examples/open-streets-dc/layers/dc-coastline.shp | Bin 0 -> 24756 bytes examples/open-streets-dc/layers/dc-coastline.shx | Bin 0 -> 116 bytes .../layers/dc_osm_highway/dc_osm_highway.dbf | Bin 642349 -> 0 bytes .../layers/dc_osm_highway/dc_osm_highway.index | Bin 157164 -> 0 bytes .../layers/dc_osm_highway/dc_osm_highway.prj | 1 - .../layers/dc_osm_highway/dc_osm_highway.shp | Bin 1981852 -> 0 bytes .../layers/dc_osm_highway/dc_osm_highway.shx | Bin 56556 -> 0 bytes .../layers/dc_osm_location/dc_osm_location.dbf | Bin 1460078 -> 0 bytes .../layers/dc_osm_location/dc_osm_location.index | Bin 134844 -> 0 bytes .../layers/dc_osm_location/dc_osm_location.prj | 1 - .../layers/dc_osm_location/dc_osm_location.shp | Bin 329744 -> 0 bytes .../layers/dc_osm_location/dc_osm_location.shx | Bin 94284 -> 0 bytes .../layers/dc_osm_natural/dc_osm_natural.dbf | Bin 67877 -> 0 bytes .../layers/dc_osm_natural/dc_osm_natural.index | Bin 56856 -> 0 bytes .../layers/dc_osm_natural/dc_osm_natural.prj | 1 - .../layers/dc_osm_natural/dc_osm_natural.shp | Bin 1313036 -> 0 bytes .../layers/dc_osm_natural/dc_osm_natural.shx | Bin 10732 -> 0 bytes examples/open-streets-dc/layers/osm-landusages.dbf | Bin 0 -> 7264078 bytes examples/open-streets-dc/layers/osm-landusages.prj | 1 + examples/open-streets-dc/layers/osm-landusages.shp | Bin 0 -> 5767120 bytes examples/open-streets-dc/layers/osm-landusages.shx | Bin 0 -> 100812 bytes examples/open-streets-dc/layers/osm-mainroads.dbf | Bin 0 -> 1631053 bytes examples/open-streets-dc/layers/osm-mainroads.prj | 1 + examples/open-streets-dc/layers/osm-mainroads.shp | Bin 0 -> 462176 bytes examples/open-streets-dc/layers/osm-mainroads.shx | Bin 0 -> 16068 bytes examples/open-streets-dc/layers/osm-motorways.dbf | Bin 0 -> 720915 bytes examples/open-streets-dc/layers/osm-motorways.prj | 1 + examples/open-streets-dc/layers/osm-motorways.shp | Bin 0 -> 178872 bytes examples/open-streets-dc/layers/osm-motorways.shx | Bin 0 -> 7156 bytes examples/open-streets-dc/layers/osm-places.dbf | Bin 0 -> 82513 bytes examples/open-streets-dc/layers/osm-places.prj | 1 + examples/open-streets-dc/layers/osm-places.shp | Bin 0 -> 4244 bytes examples/open-streets-dc/layers/osm-places.shx | Bin 0 -> 1284 bytes examples/open-streets-dc/layers/osm-roads.dbf | Bin 0 -> 6466777 bytes examples/open-streets-dc/layers/osm-roads.prj | 1 + examples/open-streets-dc/layers/osm-roads.shp | Bin 0 -> 2375816 bytes examples/open-streets-dc/layers/osm-roads.shx | Bin 0 -> 85748 bytes examples/open-streets-dc/layers/osm-waterareas.dbf | Bin 0 -> 62685 bytes examples/open-streets-dc/layers/osm-waterareas.prj | 1 + examples/open-streets-dc/layers/osm-waterareas.shp | Bin 0 -> 252880 bytes examples/open-streets-dc/layers/osm-waterareas.shx | Bin 0 -> 1028 bytes examples/open-streets-dc/project.mml | 224 +++++-- examples/open-streets-dc/style.mss | 66 +- examples/road-trip/.thumb.png | Bin 58987 -> 58222 bytes examples/road-trip/project.mml | 4 +- index.js | 23 +- lib/config.defaults.json | 6 +- lib/crashutil.js | 51 ++ lib/fsutil.js | 19 +- lib/gitutil.js | 13 + lib/redirect.js | 18 + lib/s3.js | 28 +- lib/ubuntu_gui_workaround.js | 74 +++ models/Config.bones | 10 +- models/Config.server.bones | 14 +- models/Datasource.server.bones | 92 ++- models/Export.bones | 4 + models/Exports.server.bones | 69 ++- models/Layer.bones | 8 + models/Library.server.bones | 75 ++- models/Plugin.server.bones | 6 +- models/Plugins.server.bones | 17 +- models/Preview.server.bones | 1 + models/Project.bones | 38 +- models/Project.server.bones | 99 ++- package.json | 57 +- plugins/carto/templates/Reference._ | 12 +- plugins/editor/views/Stylesheet.bones | 6 +- plugins/editor/views/Stylesheets.bones | 53 +- plugins/map/package.json | 6 - plugins/templates/templates/Templates._ | 2 +- plugins/templates/views/Templates.bones | 18 +- servers/App.bones | 54 +- servers/Core.bones | 1 + servers/OAuth.bones | 78 +-- servers/Tile.bones | 13 +- templates/Autostyle._ | 2 +- templates/Config._ | 32 +- templates/Layer._ | 33 +- {plugins/map/templates => templates}/Map._ | 0 templates/Metadata._ | 28 +- templates/MetadataSignup._ | 18 + templates/Plugin._ | 6 + templates/Plugins._ | 8 +- templates/Project._ | 5 +- templates/ProjectLayer._ | 4 +- test/abilities.test.js | 91 +-- test/config.test.js | 198 +++--- test/datasource.test.js | 154 +++-- test/duplicate_module.test.js | 25 + test/export.test.js | 139 +++-- test/fixtures/created-project.json | 2 + test/fixtures/datasource-postgis.json | 10 +- test/fixtures/datasource-shp-features.json | 2 +- test/fixtures/datasource-sqlite.json | 10 +- test/project.test.js | 274 +++++---- test/support/start.js | 191 ++++-- test/tile.test.js | 81 ++- tilemill.ico | Bin 0 -> 108366 bytes views/App.bones | 6 +- views/Config.bones | 33 +- views/Layer.bones | 96 ++- views/Layers.bones | 67 ++- views/Library.bones | 1 + {plugins/map/views => views}/Map.bones | 51 +- views/Metadata.bones | 54 +- views/Modal.bones | 12 +- views/Plugins.bones | 23 +- views/Preview.bones | 9 +- views/Project.bones | 38 +- 142 files changed, 3249 insertions(+), 1613 deletions(-) delete mode 100644 .gitmodules delete mode 100644 _config.yml create mode 100644 assets/images/controls_2x.png create mode 100644 assets/images/sprite_2x.png create mode 100644 assets/images/tilemill_2x.png create mode 100644 examples/open-streets-dc/images/water.png create mode 100644 examples/open-streets-dc/images/wood.png create mode 100644 examples/open-streets-dc/layers/dc-coastline.dbf create mode 100644 examples/open-streets-dc/layers/dc-coastline.prj create mode 100644 examples/open-streets-dc/layers/dc-coastline.shp create mode 100644 examples/open-streets-dc/layers/dc-coastline.shx delete mode 100644 examples/open-streets-dc/layers/dc_osm_highway/dc_osm_highway.dbf delete mode 100644 examples/open-streets-dc/layers/dc_osm_highway/dc_osm_highway.index delete mode 100644 examples/open-streets-dc/layers/dc_osm_highway/dc_osm_highway.prj delete mode 100644 examples/open-streets-dc/layers/dc_osm_highway/dc_osm_highway.shp delete mode 100644 examples/open-streets-dc/layers/dc_osm_highway/dc_osm_highway.shx delete mode 100644 examples/open-streets-dc/layers/dc_osm_location/dc_osm_location.dbf delete mode 100644 examples/open-streets-dc/layers/dc_osm_location/dc_osm_location.index delete mode 100644 examples/open-streets-dc/layers/dc_osm_location/dc_osm_location.prj delete mode 100644 examples/open-streets-dc/layers/dc_osm_location/dc_osm_location.shp delete mode 100644 examples/open-streets-dc/layers/dc_osm_location/dc_osm_location.shx delete mode 100644 examples/open-streets-dc/layers/dc_osm_natural/dc_osm_natural.dbf delete mode 100644 examples/open-streets-dc/layers/dc_osm_natural/dc_osm_natural.index delete mode 100644 examples/open-streets-dc/layers/dc_osm_natural/dc_osm_natural.prj delete mode 100644 examples/open-streets-dc/layers/dc_osm_natural/dc_osm_natural.shp delete mode 100644 examples/open-streets-dc/layers/dc_osm_natural/dc_osm_natural.shx create mode 100644 examples/open-streets-dc/layers/osm-landusages.dbf create mode 100644 examples/open-streets-dc/layers/osm-landusages.prj create mode 100644 examples/open-streets-dc/layers/osm-landusages.shp create mode 100644 examples/open-streets-dc/layers/osm-landusages.shx create mode 100644 examples/open-streets-dc/layers/osm-mainroads.dbf create mode 100644 examples/open-streets-dc/layers/osm-mainroads.prj create mode 100644 examples/open-streets-dc/layers/osm-mainroads.shp create mode 100644 examples/open-streets-dc/layers/osm-mainroads.shx create mode 100644 examples/open-streets-dc/layers/osm-motorways.dbf create mode 100644 examples/open-streets-dc/layers/osm-motorways.prj create mode 100644 examples/open-streets-dc/layers/osm-motorways.shp create mode 100644 examples/open-streets-dc/layers/osm-motorways.shx create mode 100644 examples/open-streets-dc/layers/osm-places.dbf create mode 100644 examples/open-streets-dc/layers/osm-places.prj create mode 100644 examples/open-streets-dc/layers/osm-places.shp create mode 100644 examples/open-streets-dc/layers/osm-places.shx create mode 100644 examples/open-streets-dc/layers/osm-roads.dbf create mode 100644 examples/open-streets-dc/layers/osm-roads.prj create mode 100644 examples/open-streets-dc/layers/osm-roads.shp create mode 100644 examples/open-streets-dc/layers/osm-roads.shx create mode 100644 examples/open-streets-dc/layers/osm-waterareas.dbf create mode 100644 examples/open-streets-dc/layers/osm-waterareas.prj create mode 100644 examples/open-streets-dc/layers/osm-waterareas.shp create mode 100644 examples/open-streets-dc/layers/osm-waterareas.shx create mode 100644 lib/crashutil.js create mode 100755 lib/gitutil.js create mode 100644 lib/redirect.js create mode 100644 lib/ubuntu_gui_workaround.js delete mode 100644 plugins/map/package.json rename {plugins/map/templates => templates}/Map._ (100%) create mode 100644 templates/MetadataSignup._ create mode 100644 test/duplicate_module.test.js create mode 100644 tilemill.ico rename {plugins/map/views => views}/Map.bones (72%) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilemill.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel