ashatora/openlayers

Go to file

Éric Lemoine 35d5158454 Merge remote-tracking branch 'upstream/master' into vector-api

Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js

2013-12-13 12:53:57 +01:00

external/src/types.js file no longer exists

2013-12-12 16:57:39 +01:00

Add @typedefs to externs file

2013-12-12 15:06:05 +01:00

File types.js no longer an input for ol.js

2013-12-12 15:02:02 +01:00

Remove ol.control.DragBox

2013-11-20 11:42:06 +01:00

Link to API docs

2013-09-24 15:14:50 +02:00

Add GeometryCollection to geojson example

2013-12-11 17:52:24 +01:00

Add GeoJSONFeature#id to externs file

2013-11-20 11:42:08 +01:00

move the licenses dir to the root of the repo

2012-03-29 21:59:58 +02:00

Merge remote-tracking branch 'upstream/master' into vector-api

2013-12-13 12:53:57 +01:00

Merge remote-tracking branch 'openlayers/master' into vector-api

2013-11-27 13:10:20 +01:00

Merge remote-tracking branch 'upstream/master' into vector-api

2013-12-13 12:53:57 +01:00

Making use of the closure-util package

2013-09-14 18:10:12 -06:00

Merge remote-tracking branch 'upstream/master' into vector-api

2013-12-13 12:53:57 +01:00

.gitignore

Making use of the closure-util package

2013-09-14 18:10:12 -06:00

.travis.yml

Use a released version of jsdoc

2013-11-06 19:11:21 +01:00

AUTHORS.md

Add @tschw to AUTHORS.md

2013-11-20 11:39:20 +01:00

build.cmd

Add build.cmd for Windows developers

2013-02-12 15:47:55 +01:00

build.py

Merge remote-tracking branch 'upstream/master' into vector-api

2013-12-13 12:53:57 +01:00

CONTRIBUTING.md

Update README and CONTRIBUTING

2013-03-22 10:59:09 +01:00

LICENSE.md

LICENSE: Fixed reference to AUTHORS file

2013-03-09 19:02:05 +01:00

package.json

Making use of the closure-util package

2013-09-14 18:10:12 -06:00

pake.py

Update to latest version of pake

2013-04-03 13:04:37 +02:00

README.md

Correct links to hosted examples (and docs)

2013-06-27 15:59:52 -06:00

requirements.txt

Add gjslint to requirements.txt

2013-10-02 13:30:19 +02:00

README.md

OpenLayers 3

Welcome to OpenLayers 3!

Check out the hosted examples or poke around the evolving API docs.

Please see our guide on contributing if you're interested in getting involved.