MEDLab/democratic-mediums
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118 Commits 1 Branch 0 Tags
221c79b42fbb28c339b125d65c7d56e0e45f026f
Commit Graph
89 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ntnsndr a7a8fe5233 Fixed typo in friendship.md 2019-07-17 23:15:41 +00:00
ntnsndr 1a1df6e70f Merge branch 'patch-19' into 'master' 
Update friendship.md

See merge request medlabboulder/democraticmediums!19
 2019-07-17 23:14:19 +00:00
ntnsndr 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
ntnsndr bb02fca0ab Merge branch 'patch-17' into 'master' 
Update eloquence.md

See merge request medlabboulder/democraticmediums!17
 2019-07-15 15:57:50 +00:00
ntnsndr 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
ntnsndr 81280d38ec Merge branch 'patch-15' into 'master' 
Update consensus.md

See merge request medlabboulder/democraticmediums!15
 2019-07-11 20:30:36 +00:00
ntnsndr 7900e52774 Small edits on constitution.md 2019-07-11 17:58:35 +00:00
ntnsndr 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
ntnsndr 954e5ee5ca Merge branch 'patch-13' into 'master' 
Update debate.md

See merge request medlabboulder/democraticmediums!13
 2019-07-11 17:34:53 +00:00
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
ntnsndr cd17517967 Merge branch 'patch-11' into 'master' 
Update constitution.md

See merge request medlabboulder/democraticmediums!11
 2019-07-11 17:33:27 +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
ntnsndr 69124e0a88 Merge branch 'patch-10' into 'master' 
Update debate.md

See merge request medlabboulder/democraticmediums!10
 2019-07-10 21:25:34 +00:00
ntnsndr 24e19fc652 Revisions to constitution.md 2019-07-10 18:03:16 +00:00
ntnsndr 5524e5107c Merge branch 'patch-9' into 'master' 
Update constitution.md

See merge request medlabboulder/democraticmediums!9
 2019-07-10 17:55:13 +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
ntnsndr 89381f3c73 Merge branch 'patch-6' into 'master' 
Update caucus.md

See merge request medlabboulder/democraticmediums!6
 2019-06-08 21:58:41 +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
ntnsndr 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
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
ntnsndr 84d7942cb8 Merge branch 'patch-3' into 'master' 
Canvassing update

See merge request medlabboulder/democraticmediums!3
 2019-06-05 16:24:28 +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
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
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
ntnsndr 7c02830b1d Merge branch 'patch-1' into 'master' 
Added information about contributing to the project.

See merge request medlabboulder/democraticmediums!1
 2019-04-08 20:08:25 +00:00
ntnsndr f4a55ddd64 Fixing icon and more 2019-04-08 04:27:25 +00:00
ntnsndr 31f8ce2ef8 More fixes in mkdocs.yml 2019-04-08 04:25:33 +00:00
ntnsndr 80a02cb872 Fixing errors 2019-04-08 04:23:17 +00:00
ntnsndr 023a67fdad Update mkdocs.yml 2019-04-08 04:16:50 +00:00
ntnsndr 07acfeea1d Trying to fix stuff 2019-04-08 04:15:38 +00:00
ntnsndr 1dd23186a1 trying black 2019-04-08 03:55:24 +00:00
ntnsndr d0ac8954e5 Small layout tweaks, esp. logos 2019-04-08 03:53:50 +00:00
ntnsndr 4b34301b85 Beginning theme customization 2019-04-07 22:10:27 +00:00
ntnsndr 6dd717847b Fixed screwed up directory placement 2019-04-07 06:10:43 +00:00
ntnsndr 001ec38b30 Update about/contribute.md, about/resources.md, about/basics.md files 
Deleted docs/contribute.md
 2019-04-07 06:07:12 +00:00
ntnsndr cad0f325f4 Update README.md 2019-04-07 06:03:45 +00:00
ntnsndr 5d1b378571 Update README.md, docs/contribute.md files 2019-04-07 06:02:42 +00:00
ntnsndr d965e7028a Add LICENSE 2019-04-07 06:00:25 +00:00
ntnsndr 33a0c9224e Update README.md, .gitlab-ci.yml, mkdocs.yml files 2019-04-07 05:59:24 +00:00
ntnsndr 207122f777 Update docs/mediums/sortition.md 2019-04-07 05:49:33 +00:00
ntnsndr 84dd600df1 Update mkdocs.yml 2019-04-07 05:44:11 +00:00
ntnsndr f16cdb3e71 Update .gitlab-ci.yml, mkdocs.yml, docs/index.md files 2019-04-07 05:37:47 +00:00