Commit Graph

160 Commits

Author SHA1 Message Date
Jay Graber 095e8b557f Merge branch 'master' into 'ssb'
# Conflicts:
#   design/preexisting/protocols/template.md
2020-06-05 16:42:44 +00:00
Jay Graber 54ef767f97 Finish madstodon 2020-06-05 09:41:34 -07:00
Jay Graber 19d3f55caa Add diaspora 2020-06-03 18:42:40 -07:00
Jay Graber d2f864ecad Merge branch 'zeronet' into 'master'
Finish zeronet

See merge request arnoldjun/bluesky!64
2020-06-04 01:35:47 +00:00
Jay Graber 6d6d130ae5 Finish zeronet 2020-06-03 18:34:20 -07:00
Jay Graber ebaf36213f Finish Aether 2020-06-03 18:22:09 -07:00
Jay Graber ab22967cbf Merge branch 'master' into 'network-structure'
# Conflicts:
#   design/preexisting/protocols/template.md
2020-06-02 23:00:18 +00:00
Jay Graber 6fab013322 Add drafts 2020-06-02 14:15:31 -07:00
Jay Graber 41dcdca1e2 Finish ssb stub article 2020-06-02 13:25:46 -07:00
Jay Graber f43f4e0963 Add network structure 2020-06-02 12:11:03 -07:00
Golda Velez a3c556fb75 Add new file 2020-06-01 01:42:43 +00:00
Mark Nadal b710f5a2ac Update gun.md 2020-05-31 22:30:15 +00:00
Golda Velez 3e1bf3b950 Update iris.md 2020-05-31 04:56:40 +00:00
Golda Velez c292a0d0da Update solid.md 2020-05-27 23:40:58 +00:00
Jay Graber bc861e20d1 Add topics, reorg files 2020-05-26 22:26:15 -07:00
Jay Graber b759fa13ae Add mls to security in topics 2020-05-26 22:18:46 -07:00
Jay Graber 871956686e Mv libp2p to topics 2020-05-26 22:17:41 -07:00
Jay Graber e8b83812ca Add applications folder, add files 2020-05-26 19:43:33 -07:00
Jay Graber 5a0710f1c2 Merge branch 'dat' into 'master'
Dat

See merge request arnoldjun/bluesky!52
2020-05-27 02:42:56 +00:00
Jay Graber 06076d6dd1 Dat has been renamed hypercore 2020-05-26 19:29:29 -07:00
Jay Graber 27bd32ed50 Rm ipfs vs dat 2020-05-24 16:22:13 -07:00
Jay Graber 5a56ef3fe9 Add dat 2020-05-24 16:22:00 -07:00
Golda Velez aae86651b3 Solid section of ecosystem review 2020-05-24 23:19:23 +00:00
Golda Velez 7924d602a8 Merge branch 'gvelez_ecosystem_activity_pub_and_solid' into 'master'
ecosystem activity pub and solid, also update matrix preexisting doc

See merge request arnoldjun/bluesky!47
2020-05-22 18:19:50 +00:00
Golda Velez e9298d64fc Merge branch 'molly/ipfs' into 'master'
IPFS

See merge request arnoldjun/bluesky!39
2020-05-18 00:44:18 +00:00
Molly 310ba2154e IPFS 2020-05-18 00:44:18 +00:00
Golda Velez ead4fa3370 add sections to protocol docs 2020-05-18 00:40:45 +00:00
Golda Velez 354bcc0295 Merge branch 'gun' into 'master'
Add GUN to pre-existing

See merge request arnoldjun/bluesky!44
2020-05-18 00:31:32 +00:00
Golda Velez dc8b87e069 Update activitypub.md 2020-05-18 00:30:31 +00:00
Golda Velez eb2984645d Update matrix.md 2020-05-18 00:29:35 +00:00
Golda Velez 41c654b751 Add new file 2020-05-18 00:22:43 +00:00
Golda Velez 0c939724be Update solid.md 2020-05-18 00:21:25 +00:00
Golda Velez e506cef631 Add new file 2020-05-18 00:21:04 +00:00
Golda Velez eb227b1490 Update ssb.md 2020-05-18 00:18:34 +00:00
Golda Velez 03757ad728 Update activitypub.md 2020-05-18 00:17:43 +00:00
Ian Preston 7f7d476359 Update peergos.md 2020-05-18 00:09:48 +00:00
Golda Velez e97b25c503 Update activitypub.md 2020-05-17 23:53:01 +00:00
Golda Velez 9b9da77894 Merge branch 'gvelez_raw_lists' into 'master'
starting to put some of the puzzle pieces down on the board...

See merge request arnoldjun/bluesky!42
2020-05-17 23:10:29 +00:00
Golda Velez 5784a09339 starting to put some of the puzzle pieces down on the board... 2020-05-17 23:10:29 +00:00
Ian Preston 6e70b4d5e9 Merge branch 'peergos' into 'master'
Preexisting: Peergos architecture

See merge request arnoldjun/bluesky!29
2020-04-27 21:00:28 +00:00
Ian Preston be4080fdd2 More Peergos update 2020-04-27 07:34:35 +00:00
Ian Preston b5e7d04cec Update Peergos information 2020-04-27 07:31:11 +00:00
Mark Nadal 4681441599 Add new file 2020-04-26 17:10:06 +00:00
Golda Velez ecdb4bb549 Revert "Update gun.md"
This reverts commit 70a770cb4664f7590a5d35ea9444e3947b1d49d0.
2020-04-26 16:57:33 +00:00
Mark Nadal c69587fb77 Update gun.md 2020-04-26 09:25:56 +00:00
Mark Nadal a5821a22f1 Add new file 2020-04-26 09:25:25 +00:00
Golda Velez 1d4d08ed4f Adding some ecosystem links and notes 2020-03-23 03:58:07 +00:00
Jay Graber 53f7484c41 Add to draft 2020-03-05 19:27:50 -08:00
Jay Graber 92b789e7fc Add draft of peergos protocol overview 2020-03-05 19:27:50 -08:00
Golda Velez 867381ec22 Adding the link to the aggregation proposal at Matrix 2020-03-05 17:54:55 +00:00