cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
update_to_master
carto/test
History
javi 7c35dda115 Merge remote-tracking branch 'origin/browserify' into update_to_master 
Conflicts:
	.gitignore
	.travis.yml
	CHANGELOG.md
	Makefile
	README.md
	bin/mml2json.js
	lib/carto/index.js
	lib/carto/parser.js
	lib/carto/tree/call.js
	lib/carto/tree/filterset.js
	lib/carto/tree/reference.js
	lib/carto/tree/ruleset.js
	package.json
	test/errorhandling.test.js
	test/errorhandling/invalid_value.mss
	test/errorhandling/invalid_value.result
	test/errorhandling/issue297.mss
	test/errorhandling/issue297.result
	test/rendering-mss.test.js
	test/rendering/transforms.mss
	test/rendering/transforms.result
	test/specificity/demo.result
	test/specificity/filters_and_ids.result
	test/specificity/issue60.result
	test/version.test.js
2014-12-04 18:35:24 +01:00
..
benchmark carto works fine with node v6, so allow it 2012-03-07 12:42:16 -08:00
errorhandling text-name is an expression so flat string is okay - tweak issue297 to actually be invalid since text-face-name is not currently an expression 2014-09-25 15:06:56 -07:00
rendering Add support for variable transforms - refs #163, and improve test coverage 2014-09-03 15:12:31 -04:00
rendering-mss Add test for proposed syntax for passing variable to mapnik (just as string) - refs #269 2014-09-25 18:57:48 -07:00
specificity update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
support update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
bincarto.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
color.test.js test color fns 2014-07-03 12:00:40 -04:00
comment.test.js Test colors and comments 2014-07-03 11:53:12 -04:00
errorhandling.test.js if test does not error (as expected) then assert false instead of hanging 2014-09-23 14:22:59 -07:00
field.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
filter.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
filterset.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
index.html added frame offset 2013-08-28 11:52:18 +02:00
operation.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
quoted.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
reference.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
rendering_js.test.js modified to support rendering order and symbolizer 2014-06-23 18:03:28 +02:00
rendering-mss.test.js trim rendering results to avoid comparing ending newlines 2014-09-25 14:56:29 -07:00
rendering.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
specificity.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00
underscore.js test files 2012-07-25 17:42:49 +02:00
version.test.js update to mapbox 0.0.11 master 2014-06-11 17:52:06 +02:00