Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

feat: Circuit Relay #1063

Merged
merged 27 commits into from
Mar 16, 2018
Merged

feat: Circuit Relay #1063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
58e0863
docs: adding circuit relay tutorial (wip)
dryajov Feb 13, 2018
448cf0e
wip
dryajov Feb 27, 2018
7c03194
(wip) relay tutorial improvements
dryajov Feb 28, 2018
c31be9b
test: rework with new ipfsd-ctl
dryajov Dec 6, 2017
e3ba300
feat: add circuit test
dryajov Jan 30, 2018
2376246
feat: name circuit relay test
dryajov Jan 30, 2018
c01a979
docs: adding circuit docs
dryajov Jan 30, 2018
b3d71c2
docs: adding circuit relay tutorial (wip)
dryajov Feb 13, 2018
7de9de2
feat: latest libp2p + other deps. Fix bugs in tests along the way
daviddias Feb 15, 2018
11e3b4f
tutorial
dryajov Feb 28, 2018
5dbe97c
tutorial lint
dryajov Feb 28, 2018
8af1f78
feat: read relay config from options and config file
dryajov Mar 5, 2018
64fc128
docs: tutorial
dryajov Mar 6, 2018
9973578
docs: clarifying specific relay addrs
dryajov Mar 7, 2018
2425ae4
docs: more clarifications
dryajov Mar 7, 2018
0483091
docs: more clarifications
dryajov Mar 7, 2018
1fa52f8
docs: more clarifications
dryajov Mar 7, 2018
80a0b7d
docs: changes based on robs review
dryajov Mar 7, 2018
3b47e5d
Add minor grammar/spelling fixes to relay doc
Mr0grog Mar 7, 2018
e0edd66
docs: small change
dryajov Mar 7, 2018
d1b0180
docs: expanded closing section
dryajov Mar 7, 2018
c9705b1
docs: more suggestions from Mr0grog
dryajov Mar 9, 2018
5cee7e6
docs: more improvements and typos
dryajov Mar 13, 2018
1a99d65
doc: minor corrections
dryajov Mar 14, 2018
4dba67c
Revert "docs: adding circuit relay tutorial (wip)"
dryajov Mar 14, 2018
9f51067
wip
dryajov Mar 14, 2018
f265445
docs: tutorial fixes
dryajov Mar 16, 2018
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
Prev Previous commit
Next Next commit
wip
  • Loading branch information
@dryajov
dryajov committed Mar 16, 2018
commit 9f51067933a9a7e5692b666f12545a75384cfebe
11 changes: 0 additions & 11 deletions examples/circuit-relaying/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,6 @@ main {
margin-bottom: 1em;
}

/* #peers i {
display: none;
margin-top: 5px;
margin-bottom: 5px;
font-size: 14px;
}

#peers.waiting i {
display: block;
} */

.errors {
grid-area: errors;
color: red;
Expand Down
2 changes: 1 addition & 1 deletion examples/circuit-relaying/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"license": "MIT",
"dependencies": {
"ipfs": "file:../../",
"ipfs-pubsub-room": "^0.3.0"
"ipfs-pubsub-room": "~0.3.0"
},
"devDependencies": {
"aegir": "^13.0.5",
Expand Down
6 changes: 3 additions & 3 deletions examples/circuit-relaying/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ const repo = () => {
const ipfs = new IPFS({
repo: repo(),
EXPERIMENTAL: {
pubsub: true,
pubsub: true, // enable pubsub
relay: {
enabled: true,
enabled: true, // enable relay dialer/listener (STOP)
hop: {
enabled: true
enabled: true // make this node a relay (HOP)
}
}
},
Expand Down