Commit Graph

75 Commits

Author SHA1 Message Date
ntnsndr c2c33acaf8 Added Warnock's Dilemma to lazy_consensus.md 2019-06-06 04:02:42 +00:00
ntnsndr af09886d3b Update docs/mediums/lazy_consensus.md, docs/about/resources.md files 2019-06-05 23:36:46 +00:00
ntnsndr 5f12607e71 Started lazy_consensus.md 2019-06-05 22:03:17 +00:00
ntnsndr b7f1e6eb00 Added Do-ocracy and some other edits 2019-06-05 21:53:40 +00:00
ntnsndr 73cdd2fade Edited canvassing for style and brevity 2019-06-05 16:40:49 +00:00
ntnsndr 84d7942cb8 Merge branch 'patch-3' into 'master'
Canvassing update

See merge request medlabboulder/democraticmediums!3
2019-06-05 16:24:28 +00:00
Laura daley 981d9ffbde Build out page
Update canvassing.md
2019-06-05 15:12:23 +00:00
ntnsndr ed677a6d3e Update docs/mediums/consensus_process.md 2019-06-04 19:36:12 +00:00
ntnsndr 61563cb0a9 Update docs/mediums/consensus_process.md 2019-06-04 19:22:26 +00:00
ntnsndr e33e8a77ca Edit on continuous_voting.md, suggested by @interfluidity: https://twitter.com/interfluidity/status/1135040606080815104 2019-06-03 02:52:21 +00:00
ntnsndr c5d3ec255f Update docs/index.md 2019-06-02 04:06:17 +00:00
ntnsndr 352986af18 Update docs/mediums/continuous_voting.md, docs/mediums/lottery_voting.md files 2019-06-02 04:05:02 +00:00
ntnsndr 4ab2aa7ddd Added Continuous voting 2019-05-31 17:16:14 +00:00
ntnsndr e21bf562fb Update docs/mediums/quadratic_voting.md 2019-05-30 05:00:13 +00:00
ntnsndr 8a8b73cde5 Update docs/about/contribute.md 2019-05-30 05:00:02 +00:00
ntnsndr a2b61f1688 Merge branch 'patch-1' into 'master'
Updates to Contributions page

See merge request medlabboulder/democraticmediums!2
2019-05-30 04:38:11 +00:00
Laura daley 74a9d2bc73 Added a few details and sub-steps to the instructions based on my experience-- i.e., defining "fork" upon its first use, letting the new user know they have to confirm their account via email to start editing, and adding an instruction to click the "edit" button, which only then triggers the creation of a fork.
Update contribute.md
2019-05-29 16:04:05 +00:00
ntnsndr e0eb5c0f20 Update quadratic_voting.md: added redistribution possibility 2019-05-28 18:06:56 +00:00
ntnsndr ecbe843e08 Update index.md: small comma addition 2019-05-28 18:04:17 +00:00
ntnsndr 624b2170d1 Added quadratic decay function to quadratic_voting.md 2019-05-28 18:02:23 +00:00
ntnsndr 34c1852c32 Added Quadratic voting 2019-05-28 18:00:10 +00:00
ntnsndr f9dcba0a4e Update resources.md 2019-05-21 19:50:59 +00:00
ntnsndr 5e494ca219 Created Federation.md 2019-05-18 04:12:23 +00:00
ntnsndr 6ff2682f3d Update contribute.md 2019-05-16 04:05:26 +00:00
ntnsndr 165b63a293 Added Lightning Network to federation.md 2019-05-16 03:35:16 +00:00
ntnsndr 5f618fd8b6 Added some new mediums 2019-05-13 21:23:44 +00:00
ntnsndr 8d7797c05b Update basics.md 2019-05-12 21:07:44 +00:00
ntnsndr a4173690a0 Update basics.md 2019-05-11 17:21:52 +00:00
ntnsndr 1686ed1593 Small adjustments to index.md 2019-05-10 04:12:37 +00:00
ntnsndr 033e050055 Added "Board" and some other small changes. 2019-05-10 04:11:35 +00:00
ntnsndr d88157e807 Added Ownership.md content 2019-05-09 04:55:39 +00:00
ntnsndr f1cc1ea73a Changed "History" to "Background," started Ownership.md 2019-05-07 16:03:21 +00:00
ntnsndr 892f67194c Small adjustment on Contribute.md 2019-04-24 05:07:50 +00:00
ntnsndr 3bcfbf9dc4 Added Delegation 2019-04-23 04:01:18 +00:00
ntnsndr 751d0c1fd9 Update docs/mediums/delegation.md, docs/mediums/quadratic_voting.md files 2019-04-19 04:41:05 +00:00
ntnsndr fa40e1efe5 Removed the stuff about scale from Basics 2019-04-16 19:32:11 +00:00
ntnsndr ea5df9f204 Tweaked Basics to including emphasis on scale; added yunity to Resources 2019-04-16 03:14:29 +00:00
ntnsndr 9b0b945caa Update docs/mediums/sortition.md, docs/mediums/secret_ballot.md, docs/mediums/board.md files
Deleted docs/mediums/boards.md
2019-04-11 22:31:13 +00:00
ntnsndr eff0a0d053 Added a bunch of new blank entries 2019-04-11 04:22:21 +00:00
ntnsndr 9b8ce41558 Created Ritual entry 2019-04-11 04:06:46 +00:00
ntnsndr ecea9b9387 Update docs/about/basics.md, docs/index.md files 2019-04-10 17:43:43 +00:00
ntnsndr 5b4c187971 Added to Contribute roadmap 2019-04-10 17:39:13 +00:00
ntnsndr 4e95145ea9 Removed deprecated templates from mediums pages; added dgov resources to Further Resources 2019-04-10 16:37:45 +00:00
Nathan Schneider 101898b6e3 Created several example entries; edited the .template.md; added to the Contribute page 2019-04-09 23:02:05 -06:00
ntnsndr 3855b95bb4 Added Style section to Contribute page; Added other directories listing to Resources 2019-04-09 17:22:09 +00:00
ntnsndr c6e75adaf2 Update basics.md 2019-04-09 03:50:08 +00:00
Nathan Schneider 7386aff637 Added a few dummies, clipped README and added to Contribute 2019-04-08 21:43:46 -06:00
Nathan Schneider 89b2dfe9ca added Buchanan quote and modified delegation 2019-04-08 16:13:24 -06:00
Nathan Schneider b4669e5d7c Added dummy pages for first set of Mediums 2019-04-08 15:45:59 -06:00
Nathan Schneider c8ee54421a Created template, set up resources, changed material-theme directory name 2019-04-08 15:29:03 -06:00