Commit Graph

147 Commits

Author SHA1 Message Date
Jay Graber a055623b12 Fill out data section 2020-07-02 16:31:41 -07:00
Jay Graber 7664fb8318 Edit headers 2020-07-01 15:13:53 -07:00
Jay Graber 5027bd8645 Update discovery, ssb, blockchain-social 2020-07-01 15:09:13 -07:00
Jay Graber ce966decac Update moderation 2020-07-01 15:08:55 -07:00
Jay Graber defcafda65 Merge branch 'refactor' into 'master'
Draft topics

See merge request arnoldjun/bluesky!84
2020-07-01 01:00:17 +00:00
Jay Graber 106225cfc8 Edit security 2020-06-30 17:58:07 -07:00
Jay Graber 2695fe1cac Add data sections 2020-06-30 17:00:26 -07:00
Jay Graber 573a77e169 Add monetization 2020-06-30 17:00:11 -07:00
Jay Graber 5362fe7fdc Governance typo edits 2020-06-29 17:22:17 -07:00
Jay Graber 07c5539c73 Add aether to data 2020-06-29 17:20:44 -07:00
Jay Graber 911199f51c Merge branch 'master' of gitlab.com:arnoldjun/bluesky into refactor 2020-06-29 17:20:26 -07:00
rahul-ki 92fd0ed279 More details in governance.md 2020-06-30 00:20:09 +00:00
Jay Graber 9181c82869 Add ssb-social stub, update overview wording 2020-06-23 10:40:24 -07:00
Jay Graber 989b4035d2 Add edits 2020-06-23 09:54:48 -07:00
Jay Graber 2522ef21e1 Rename ssb social 2020-06-18 18:07:26 -07:00
Jay Graber c394ade970 Rm zeronet 2020-06-18 18:06:49 -07:00
Jay Graber 62c9a16422 Change template, move user exp to applications 2020-06-18 18:03:10 -07:00
Jay Graber 2eecc822fa Rename IPFS file 2020-06-18 10:39:53 -07:00
Jay Graber 78d02fd92f Add iris to gun 2020-06-18 10:39:46 -07:00
Jay Graber ba2da19155 Edit contributor list 2020-06-17 21:01:11 -07:00
Jay Graber eda37d3b50 Rm raw stack notes 2020-06-17 20:59:21 -07:00
Jay Graber 88dc0dbba4 Rm steemit, put under blockchain social 2020-06-17 20:57:37 -07:00
Jay Graber 1f18ee8885 Rm planetary for now 2020-06-17 20:52:20 -07:00
Jay Graber 7b5ca59527 Incorporate Andre feedback to ssb 2020-06-17 20:49:58 -07:00
Jay Graber 60f2fc6e22 Rm ceramic until after launch, or on second pass 2020-06-17 20:06:30 -07:00
Jay Graber 280b77c642 Merge branch 'master' of gitlab.com:arnoldjun/bluesky 2020-06-17 17:44:48 -07:00
Jay Graber 0e517314b6 add topics 2020-06-17 17:44:44 -07:00
Danny Zuckerman 2f0d6019f0 Adding overview of Ceramic protocol and network 2020-06-17 13:40:40 +00:00
Jay Graber ebcca45653 Edit governance 2020-06-16 20:49:36 -07:00
Jay Graber 382a43b0f3 Edit governance 2020-06-16 20:42:08 -07:00
Jay Graber 916b95d5ef Add governance headers 2020-06-16 20:25:28 -07:00
Jay Graber ce0a2dde64 Edits 2020-06-16 17:58:11 -07:00
Jay Graber 30338f4e39 Add identity draft 2020-06-16 13:45:41 -07:00
Jay Graber d955b62a1d Draft identity 2020-06-16 13:27:33 -07:00
Jay Graber c8cd1870d3 Merge branch 'xmpp' into 'master'
Xmpp

See merge request arnoldjun/bluesky!75
2020-06-16 20:27:01 +00:00
Jay Graber 4d7a16e164 Edit matrix, xmpp draft. 2020-06-16 13:26:00 -07:00
Jay Graber d5be0d17f1 Merge branch 'solid' into 'master'
Finish Solid

See merge request arnoldjun/bluesky!73
2020-06-16 00:05:47 +00:00
Jay Graber 90ff069dcf Fix links 2020-06-15 17:04:30 -07:00
Jay Graber 6ee50d7b6d Ian's edits peergos 2020-06-15 17:03:03 -07:00
Jay Graber 2e2ff2f3e6 Add contributors to overview 2020-06-15 17:01:25 -07:00
Jay Graber 97add6c634 Edit solid 2020-06-15 17:01:07 -07:00
Jay Graber f8fcbe858a Merge branch 'mastodon' into 'master'
Mastodon

See merge request arnoldjun/bluesky!66
2020-06-15 20:51:49 +00:00
Jay Graber 9272e741da fix typo 2020-06-15 13:45:08 -07:00
Jay Graber e3b0e21fff Update peergos 2020-06-15 13:43:06 -07:00
Jay Graber 2bbaa6aad7 edit ssb 2020-06-15 12:51:38 -07:00
Jay Graber e22b600c8d Edit ssb 2020-06-15 12:50:36 -07:00
Jay Graber dda8d1cd7d Edit ssb, add link to gun 2020-06-15 12:27:04 -07:00
Jay Graber a2ad7de88f Merge branch 'ipfs' into 'master'
Ipfs

See merge request arnoldjun/bluesky!71
2020-06-15 17:16:47 +00:00
Jay Graber 2e3bc51f6f Add node count 2020-06-15 10:16:25 -07:00
Jay Graber 643396e67c Merge branch 'master' into 'dat'
# Conflicts:
#   design/preexisting/protocols/template.md
2020-06-15 17:12:50 +00:00