Skip to content

Commit a24ade0

Browse files
garrisgarris
committed
Merge branch 'version_2_0'
# Conflicts: # README.md # capture/genBitmaps.js # gulp/util/paths.js # test/login/backstop_data/casper_scripts/onBefore.js
2 parents 2c55b4d + 0dd1432 commit a24ade0

File tree

197 files changed

+12662
-4289
lines changed

Some content is hidden

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

197 files changed

+12662
-4289
lines changed

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bower_components

‎.eslintrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "eslint-config-semistandard",
3+
"rules": {
4+
"no-multi-str": 0
5+
}
6+
}

‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ node_modules
2323

2424
compare/bower_components/**/.*
2525

26-
bitmaps_test
27-
bitmaps_reference
28-
compare/config.json
26+
/backstop_data/bitmaps_test/
27+
/backstop_data/html_report/
28+
compare/config.js
2929
capture/config.json

‎.jscsrc

-3
This file was deleted.

‎.jshintrc

-18
This file was deleted.

‎.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- "0.12"
4+
- "4"
5+
- "5"
6+
- "6"
47
install:
58
- npm install
69
script:
7-
- npm run genConfig
8-
- npm run reference
9-
- npm run test
10-
10+
- mkdir newdir && cd newdir && node ../cli/index.js genConfig && node ../cli/index.js reference && node ../cli/index.js test

0 commit comments

Comments
 (0)