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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs-inactive/js-ipfs-http-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 57056ae14c4d
Choose a base ref
...
head repository: ipfs-inactive/js-ipfs-http-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b90cd64a9e5
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 25, 2015

  1. add option to change CORS

    @daviddias
    daviddias committed Oct 25, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1da5999 View commit details

  2. Merge branch 'solid-tests' of github.com:ipfs/node-ipfs-api into soli… 

    …d-tests
    @daviddias
    daviddias committed Oct 25, 2015
    Copy the full SHA
    5b90cd6 View commit details
Showing with 9 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +7 −1 gulpfile.js
  3. +1 −1 test/tmp-disposable-nodes-addrs.json
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@ node_modules
some-test.js
npm-debug.log
sauce_connect.log
test/tmp-disposable-nodes-addrs.json
8 changes: 7 additions & 1 deletion gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,12 @@ function startDisposableDaemons (callback) {
if (err) {
throw err
}

/*
ipfsNodes[key].setConfig('API.HTTPHeaders', 'Access-Control-Allow-Origin=*', function (err) {
if (err) {
throw err
}
*/
ipfsNodes[key].startDaemon(function (err, ignore) {
if (err) {
throw err
@@ -88,6 +93,7 @@ function startDisposableDaemons (callback) {
apiAddrs[key] = ipfsNodes[key].apiAddr
cb()
})
// })
})
})
})
2 changes: 1 addition & 1 deletion test/tmp-disposable-nodes-addrs.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"c":"/ip4/127.0.0.1/tcp/58191","b":"/ip4/127.0.0.1/tcp/58198","a":"/ip4/127.0.0.1/tcp/58213"}
{"c":"/ip4/127.0.0.1/tcp/63289","a":"/ip4/127.0.0.1/tcp/63290","b":"/ip4/127.0.0.1/tcp/63303"}