Merge pull request #2506 from palantir/r1.4.0

Release version 1.4.0 (--> master)
palantir · Jul 24, 2015 · cad93fc · cad93fc
2 parents 096e5ee + ab31b5b
commit cad93fc
Show file tree

Hide file tree

Showing 35 changed files with 1,687 additions and 823 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,28 @@
-.DS_Store
-*.tmp.txt
-node_modules
-build
-plottable_multifile.js
-test/tests_multifile.js
-local/
+# Build files
+build/
+test/tests.js
+
+# Typescript
+.baseDir.ts
 .tscache/
+
+# Project specific
+node_modules/
+local/
 quicktests/github_token.txt
 quicktests/overlaying/list_of_quicktests.json
+
+# Mac
+.DS_Store
+*.tmp.txt
+
+# IntelliJ
 .idea/
-test/tests.js
+
 # Emacs
 .#*
-# vim
+
+# Vim
 *.swp
 *~
 
@@ -21,3 +31,4 @@ test/tests.js
 
 # Visual Studio Code
 .settings/
+
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 language: node_js
 node_js:
-- '0.10'
+- '0.12'
 notifications:
   email: false
+sudo: false
+cache:
+  directories:
+  - node_modules
 env:
   global:
   - secure: D/VxpQ0fvxqD75Qgwa0HcxbQYNsIv+D7RJ+khiAwNlsluY9VKH84O0hmCQ1ijHKrUTGbSEqAkbNS+D0hvngmSfLCgsNhZyDVTZ0s2kzjV2v5jXrvppr7TmBsCUcp6+5CEgoL/0UL3w+Me3bq9WioMDD0AkmAwAdR/B2LJojEsEY=