Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Chore/updates #196

Merged
merged 2 commits into from
Jan 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test/test-folder/ipfs-add.js
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
},
"devDependencies": {
"babel-core": "^6.1.21",
"babel-eslint": "^4.1.6",
"babel-eslint": "^5.0.0-beta6",
"babel-loader": "^6.2.0",
"babel-plugin-transform-runtime": "^6.1.18",
"babel-preset-es2015": "^6.0.15",
"babel-runtime": "^5.8.34",
"babel-runtime": "^6.3.19",
"chai": "^3.4.1",
"concurrently": "^1.0.0",
"eslint-config-standard": "^4.4.0",
Expand All @@ -45,7 +45,7 @@
"gulp-tag-version": "^1.3.0",
"gulp-util": "^3.0.7",
"https-browserify": "0.0.1",
"ipfsd-ctl": "^0.7.1",
"ipfsd-ctl": "^0.8.0",
"json-loader": "^0.5.3",
"karma": "^0.13.11",
"karma-chrome-launcher": "^0.2.1",
Expand Down
5 changes: 1 addition & 4 deletions tasks/daemons.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ function startDisposableDaemons (callback) {

const headers = {
HTTPHeaders: {
'Access-Control-Allow-Origin': ['*'],
// TODO: When ipfs/go-ipfs#1979 is merged drop these
'Access-Control-Allow-Headers': ['X-Stream-Output, X-Chunked-Output'],
'Access-Control-Expose-Headers': ['X-Stream-Output, X-Chunked-Output']
'Access-Control-Allow-Origin': ['*']
}
}
ipfsNodes[key].setConfig('API', JSON.stringify(headers), err => {
Expand Down