Skip to content

Commit 86714b7

Browse files
authored
Merge pull request #244 from imulus/develop
Merge develop 2.0 into master
2 parents 5f35e68 + 044478b commit 86714b7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2168
-859
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015"]
3+
}

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ root = true
22

33
[*]
44
indent_style = space
5-
indent_size = 4
5+
indent_size = 2
66
end_of_line = lf
77
charset = utf-8
88
trim_trailing_whitespace = true

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
test/*
2+
dist/*

.eslintrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": ["axial"],
3+
"rules": {
4+
"no-var": 0,
5+
"prefer-arrow-callback": 0,
6+
"prefer-template": 0,
7+
"vars-on-top": 0
8+
}
9+
}

.jshintrc

Lines changed: 0 additions & 26 deletions
This file was deleted.

.travis.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- "6.2.0"
4+
env:
5+
- CXX=g++-4.8
6+
7+
addons:
8+
apt:
9+
sources:
10+
- ubuntu-toolchain-r-test
11+
packages:
12+
- g++-4.8
13+
14+
cache:
15+
directories:
16+
- node_modules
17+
418
notifications:
519
recipients:
6-
- ci@imulus.com
20+
- developer@axial.agency

Gruntfile.js

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)