 ntnsndr
|
bf1f3b3985
|
Merge branch 'patch-12' into 'master'
Update debate.md
See merge request medlabboulder/democraticmediums!12
|
2019-07-11 17:34:09 +00:00 |
|
 Laura daley
|
38c39b0f05
|
Update debate.md
|
2019-07-11 01:16:53 +00:00 |
|
|
Laura daley
|
13ee63129a
|
Update constitution.md
|
2019-07-11 00:59:28 +00:00 |
|
|
ntnsndr
|
eb395e27a6
|
Update docs/mediums/debate.md, docs/mediums/consensus_process.md, docs/mediums/consensus.md files
|
2019-07-10 21:31:57 +00:00 |
|
|
ntnsndr
|
cf20fb32c0
|
Deleted docs/mediums/consensus_protocol.md
|
2019-07-10 21:30:26 +00:00 |
|
|
Laura daley
|
7a1a51f988
|
Update debate.md
|
2019-07-10 20:51:28 +00:00 |
|
|
ntnsndr
|
24e19fc652
|
Revisions to constitution.md
|
2019-07-10 18:03:16 +00:00 |
|
|
Laura daley
|
605bb5054f
|
Update constitution.md
|
2019-07-10 17:25:51 +00:00 |
|
|
ntnsndr
|
c590787ca6
|
Added placeholder for Rough Consensus.
|
2019-07-08 03:53:37 +00:00 |
|
|
ntnsndr
|
2c10cd877e
|
Updated caucus.md with @lcdaley's edits
|
2019-06-10 17:50:20 +00:00 |
|
|
ntnsndr
|
5ad80f70e4
|
Updated coalition.md with @lcdaley's edits
|
2019-06-10 17:49:21 +00:00 |
|
|
ntnsndr
|
abf86e22a5
|
Update docs/mediums/membership.md
Deleted docs/mediums/identity.md
|
2019-06-10 17:26:55 +00:00 |
|
|
ntnsndr
|
77479b5eb8
|
Update docs/mediums/caucus.md
|
2019-06-08 22:01:41 +00:00 |
|
|
Laura daley
|
f2e11b8976
|
Update caucus.md
|
2019-06-08 15:04:25 +00:00 |
|
|
ntnsndr
|
124cc52ca0
|
Update docs/mediums/proportional_representation.md
|
2019-06-07 22:10:01 +00:00 |
|
|
ntnsndr
|
de0956f56d
|
Further concision for proportional_representation.md
|
2019-06-07 22:02:52 +00:00 |
|
|
ntnsndr
|
6ff3835112
|
Small edits to new entries
|
2019-06-07 21:43:16 +00:00 |
|
|
ntnsndr
|
46afd4b8a8
|
Merge branch 'patch-4' into 'master'
Update approval-voting.md
See merge request medlabboulder/democraticmediums!4
|
2019-06-07 20:47:59 +00:00 |
|
|
Laura daley
|
e0f63ff1e7
|
Update proportional_representation.md
|
2019-06-07 17:23:56 +00:00 |
|
|
Laura daley
|
64ea6a12ca
|
Update approval-voting.md
|
2019-06-07 15:43:48 +00:00 |
|
|
ntnsndr
|
159a99ee73
|
Update do-ocracy.md
|
2019-06-06 04:19:08 +00:00 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|