141 Commits

Author SHA1 Message Date
7f2e97d13d Update judiciary.md: added Aragon Court 2019-11-29 17:52:46 +00:00
6424ce20b9 Added Disapproval Voting 2019-11-15 22:26:18 +00:00
751bed6533 Merge branch 'patch-26' into 'master'
Update transparency.md

See merge request medlabboulder/democraticmediums!26
2019-10-16 21:25:14 +00:00
Laura daley
5116ac2f98 Update transparency.md 2019-10-16 19:14:26 +00:00
68556fc261 Added petition.md 2019-09-28 23:44:53 +00:00
057eaefad3 Merge branch 'patch-24' into 'master'
Update polling.md

See merge request medlabboulder/democraticmediums!24
2019-09-24 19:27:55 +00:00
5633cbeb26 Merge branch 'patch-25' into 'master'
Update multicameralism.md

See merge request medlabboulder/democraticmediums!25
2019-09-24 19:27:42 +00:00
Laura daley
bb8bc355e1 Update multicameralism.md 2019-09-24 03:01:06 +00:00
Laura daley
970fcba5c7 Update polling.md 2019-09-24 02:55:21 +00:00
8eb384ea6c Update resources.md 2019-09-09 03:19:39 +00:00
5074e119b0 Added Network Governance Research via DGOV to Resources 2019-09-08 03:18:17 +00:00
12a3360694 Update resources.md 2019-08-22 15:38:11 +00:00
c207396af9 Outlined three-level structure in contribute.md 2019-08-20 12:46:36 +00:00
47038b5f5a Update sortition.md to add Aragon Court 2019-08-19 22:33:04 +00:00
aff9ee4de4 Merge branch 'patch-23' into 'master'
Update majority_voting.md

See merge request medlabboulder/democraticmediums!23
2019-08-19 22:24:20 +00:00
Laura daley
f4c7c6fa1f Update majority_voting.md 2019-08-19 16:51:16 +00:00
b1723928ca Update docs/about/basics.md, docs/mediums/judiciary.md files 2019-08-12 05:21:48 +00:00
efc8680b21 Merge branch 'patch-22' into 'master'
Update judiciary.md

See merge request medlabboulder/democraticmediums!22
2019-08-12 05:02:13 +00:00
Laura daley
e9bec188fc Update judiciary.md 2019-08-11 02:35:18 +00:00
3e6effb0ea Merge branch 'patch-21' into 'master'
Update lobbying.md

See merge request medlabboulder/democraticmediums!21
2019-07-31 17:14:28 +00:00
Laura daley
590f92a386 Update lobbying.md 2019-07-31 16:22:13 +00:00
235e44242b Update sortition.md 2019-07-26 04:28:43 +00:00
085d6b3dca Merge branch 'patch-20' into 'master'
Update lottery_voting.md

See merge request medlabboulder/democraticmediums!20
2019-07-22 15:56:10 +00:00
Laura daley
221c79b42f Update lottery_voting.md 2019-07-22 15:50:21 +00:00
a7a8fe5233 Fixed typo in friendship.md 2019-07-17 23:15:41 +00:00
1a1df6e70f Merge branch 'patch-19' into 'master'
Update friendship.md

See merge request medlabboulder/democraticmediums!19
2019-07-17 23:14:19 +00:00
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