Merge pull request #244 from imulus/develop

Merge develop 2.0 into master
strues · Jun 21, 2016 · 86714b7 · 86714b7
2 parents 5f35e68 + 044478b
commit 86714b7
Show file tree

Hide file tree

Showing 57 changed files with 2,168 additions and 859 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/.editorconfig b/.editorconfig
@@ -2,7 +2,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+test/*
+dist/*
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,9 @@
+{
+    "extends": ["axial"],
+    "rules": {
+      "no-var": 0,
+      "prefer-arrow-callback": 0,
+      "prefer-template": 0,
+      "vars-on-top": 0
+    }
+}
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,20 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "6.2.0"
+env:
+  - CXX=g++-4.8
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+
+cache:
+  directories:
+    - node_modules
+
 notifications:
   recipients:
-  - [email protected]
+  - [email protected]
diff --git a/Gruntfile.js b/Gruntfile.js