Skip to content
This repository was archived by the owner on Feb 12, 2024. 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/js-ipfs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3ad40fc1812304bb3906f948697f7f35ffe55c2
Choose a base ref
...
head repository: ipfs/js-ipfs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0fc3a7f8d8317ea6a60cdc93a7023eb9de511e83
Choose a head ref
Loading
Showing 421 changed files with 11,538 additions and 3,982 deletions.
21 changes: 19 additions & 2 deletions .aegir.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
'use strict'

const createServer = require('ipfsd-ctl').createServer

const server = createServer()

module.exports = {
webpack: {
resolve: {
mainFields: ['browser', 'main']
}
},
karma: {
files: [{
pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
pattern: 'node_modules/interface-ipfs-core/js/test/fixtures/**/*',
watched: false,
served: true,
included: false
}]
}],
browserNoActivityTimeout: 100 * 1000,
singleRun: true
},
hooks: {
browser: {
pre: server.start.bind(server),
post: server.stop.bind(server)
}
}
}
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[*]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
**/*.log
test/repo-tests*
**/bundle.js

docs
# Logs
logs
*.log
@@ -34,9 +34,10 @@ node_modules

lib
dist
test/test-data/go-ipfs-repo/LOCK
test/test-data/go-ipfs-repo/LOG
test/test-data/go-ipfs-repo/LOG.old
test/fixtures/go-ipfs-repo/LOCK
test/fixtures/go-ipfs-repo/LOG
test/fixtures/go-ipfs-repo/LOG.old

# while testing npm5
package-lock.json
yarn.lock
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

Loading