Skip to content

Commit

Permalink
Merge branch 'master' into sort-plugin
Browse files Browse the repository at this point in the history
Conflicts:
	map/sort/sort_test.js
  • Loading branch information
Chris Gomez committed Feb 17, 2015
2 parents 2d2e507 + abce1fe commit 24ceac2
Show file tree
Hide file tree
Showing 371 changed files with 24,263 additions and 10,847 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ docs*
.idea
bower_components/
test/pluginified/latest.js
docco
docco
test/builders/steal-tools/dist/
test/builders/steal-tools/bundle/dist/
test/builders/browserify/out.js
16 changes: 16 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.tmp*
*.swp
*.orig
*node_modules*
standalone*
docs*
*.DS_Store
.idea
bower_components/
test/pluginified/latest.js
docco
test/
build/
guides/
resources/
lib/
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
language: node_js
node_js: 0.10
script: npm test
before_script: node_modules/.bin/bower install
script: npm test
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
env:
- TEST_SUITE=loaders
- TEST_SUITE=dists
- TEST_SUITE=individuals

0 comments on commit 24ceac2

Please sign in to comment.