Laura daley
|
0aed55b8ad
|
Update friendship.md
|
2019-07-17 17:11:44 +00:00 |
|
|
|
6bc2439d4b
|
Merge branch 'patch-18' into 'master'
Update fact_finding.md
See merge request medlabboulder/democraticmediums!18
|
2019-07-17 03:29:43 +00:00 |
|
Laura daley
|
2ef047a52d
|
Update fact_finding.md
|
2019-07-16 21:00:23 +00:00 |
|
|
|
bb02fca0ab
|
Merge branch 'patch-17' into 'master'
Update eloquence.md
See merge request medlabboulder/democraticmediums!17
|
2019-07-15 15:57:50 +00:00 |
|
Laura daley
|
620032163d
|
Update eloquence.md
|
2019-07-13 14:39:49 +00:00 |
|
|
|
aa3af675ef
|
Merge branch 'patch-16' into 'master'
Update separation_of_powers.md
See merge request medlabboulder/democraticmediums!16
|
2019-07-12 16:12:42 +00:00 |
|
Laura daley
|
f0427c2e48
|
Update separation_of_powers.md
|
2019-07-12 01:40:06 +00:00 |
|
|
|
81280d38ec
|
Merge branch 'patch-15' into 'master'
Update consensus.md
See merge request medlabboulder/democraticmediums!15
|
2019-07-11 20:30:36 +00:00 |
|
Laura daley
|
2c5b190bd3
|
Update consensus.md
|
2019-07-11 18:46:07 +00:00 |
|
|
|
7900e52774
|
Small edits on constitution.md
|
2019-07-11 17:58:35 +00:00 |
|
|
|
9ab240a4fe
|
Merge branch 'patch-14' into 'master'
Update term_limit.md
See merge request medlabboulder/democraticmediums!14
|
2019-07-11 17:35:44 +00:00 |
|
|
|
954e5ee5ca
|
Merge branch 'patch-13' into 'master'
Update debate.md
See merge request medlabboulder/democraticmediums!13
|
2019-07-11 17:34:53 +00:00 |
|
|
|
bf1f3b3985
|
Merge branch 'patch-12' into 'master'
Update debate.md
See merge request medlabboulder/democraticmediums!12
|
2019-07-11 17:34:09 +00:00 |
|
|
|
cd17517967
|
Merge branch 'patch-11' into 'master'
Update constitution.md
See merge request medlabboulder/democraticmediums!11
|
2019-07-11 17:33:27 +00:00 |
|
Laura daley
|
e148c0305c
|
Update term_limit.md
|
2019-07-11 17:08:30 +00:00 |
|
Laura daley
|
08d91cf3e3
|
Update debate.md
|
2019-07-11 01:46:40 +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 |
|
|
|
eb395e27a6
|
Update docs/mediums/debate.md, docs/mediums/consensus_process.md, docs/mediums/consensus.md files
|
2019-07-10 21:31:57 +00:00 |
|
|
|
cf20fb32c0
|
Deleted docs/mediums/consensus_protocol.md
|
2019-07-10 21:30:26 +00:00 |
|
|
|
69124e0a88
|
Merge branch 'patch-10' into 'master'
Update debate.md
See merge request medlabboulder/democraticmediums!10
|
2019-07-10 21:25:34 +00:00 |
|
Laura daley
|
7a1a51f988
|
Update debate.md
|
2019-07-10 20:51:28 +00:00 |
|
|
|
24e19fc652
|
Revisions to constitution.md
|
2019-07-10 18:03:16 +00:00 |
|
|
|
5524e5107c
|
Merge branch 'patch-9' into 'master'
Update constitution.md
See merge request medlabboulder/democraticmediums!9
|
2019-07-10 17:55:13 +00:00 |
|
Laura daley
|
605bb5054f
|
Update constitution.md
|
2019-07-10 17:25:51 +00:00 |
|
|
|
c590787ca6
|
Added placeholder for Rough Consensus.
|
2019-07-08 03:53:37 +00:00 |
|
|
|
2c10cd877e
|
Updated caucus.md with @lcdaley's edits
|
2019-06-10 17:50:20 +00:00 |
|
|
|
5ad80f70e4
|
Updated coalition.md with @lcdaley's edits
|
2019-06-10 17:49:21 +00:00 |
|
|
|
abf86e22a5
|
Update docs/mediums/membership.md
Deleted docs/mediums/identity.md
|
2019-06-10 17:26:55 +00:00 |
|
|
|
77479b5eb8
|
Update docs/mediums/caucus.md
|
2019-06-08 22:01:41 +00:00 |
|
|
|
89381f3c73
|
Merge branch 'patch-6' into 'master'
Update caucus.md
See merge request medlabboulder/democraticmediums!6
|
2019-06-08 21:58:41 +00:00 |
|
Laura daley
|
f2e11b8976
|
Update caucus.md
|
2019-06-08 15:04:25 +00:00 |
|
|
|
124cc52ca0
|
Update docs/mediums/proportional_representation.md
|
2019-06-07 22:10:01 +00:00 |
|
|
|
de0956f56d
|
Further concision for proportional_representation.md
|
2019-06-07 22:02:52 +00:00 |
|
|
|
6ff3835112
|
Small edits to new entries
|
2019-06-07 21:43:16 +00:00 |
|
|
|
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 |
|
|
|
7832281c52
|
Merge branch 'patch-5' into 'master'
Update proportional_representation.md
See merge request medlabboulder/democraticmediums!5
|
2019-06-07 20:46:01 +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 |
|
|
|
159a99ee73
|
Update do-ocracy.md
|
2019-06-06 04:19:08 +00:00 |
|
|
|
c2c33acaf8
|
Added Warnock's Dilemma to lazy_consensus.md
|
2019-06-06 04:02:42 +00:00 |
|
|
|
af09886d3b
|
Update docs/mediums/lazy_consensus.md, docs/about/resources.md files
|
2019-06-05 23:36:46 +00:00 |
|
|
|
5f12607e71
|
Started lazy_consensus.md
|
2019-06-05 22:03:17 +00:00 |
|
|
|
b7f1e6eb00
|
Added Do-ocracy and some other edits
|
2019-06-05 21:53:40 +00:00 |
|
|
|
73cdd2fade
|
Edited canvassing for style and brevity
|
2019-06-05 16:40:49 +00:00 |
|
|
|
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 |
|
|
|
ed677a6d3e
|
Update docs/mediums/consensus_process.md
|
2019-06-04 19:36:12 +00:00 |
|
|
|
61563cb0a9
|
Update docs/mediums/consensus_process.md
|
2019-06-04 19:22:26 +00:00 |
|
|
|
e33e8a77ca
|
Edit on continuous_voting.md, suggested by @interfluidity: https://twitter.com/interfluidity/status/1135040606080815104
|
2019-06-03 02:52:21 +00:00 |
|
