Commit Graph

103 Commits

Author SHA1 Message Date
Josh Cincinnati 7c49d847e8
Merge pull request #36 from sonyamann/patch-13
archival notices for elections repo
2019-01-17 17:51:56 -05:00
Sonya Mann a1fbd36cd2
archival notice for 2018 folder 2019-01-17 13:49:25 -08:00
Sonya Mann 58f238a25c
elections archival notice 2019-01-17 13:47:43 -08:00
Josh Cincinnati 952ca35347 update with helios link and updated dates 2018-06-22 15:47:25 -04:00
Josh Cincinnati 2f2042b706 one last addition 2018-06-21 19:57:34 -04:00
Josh Cincinnati 57bc283738 last additions 2018-06-20 13:30:59 -04:00
Josh Cincinnati 552261d257
Merge pull request #34 from sonyamann/patch-12
Add Aparna's attestation
2018-06-18 19:53:19 +00:00
Sonya Mann c032f6f9f0
Add Aparna's attestation 2018-06-18 12:16:26 -07:00
Josh Cincinnati dd288349f8 adds alex, who was listed earlier 2018-06-17 22:43:06 -04:00
Josh Cincinnati f539fbf2a1 clarification 2018-06-15 19:51:44 -04:00
Josh Cincinnati 22fe4bebf7 Merge branch 'master' of github.com:ZcashFoundation/Elections 2018-06-15 11:33:38 -04:00
Josh Cincinnati 27364bd413 updates 2018-06-15 11:33:30 -04:00
Josh Cincinnati 589c1bf5f1
Merge pull request #32 from realcodywburns/patch-2
Rename sample_ballot.md to Foundation_Mascot_ballot.md
2018-06-15 03:20:59 +00:00
Cody Burns 755b4bc323
Rename sample_ballot.md to Foundation_Mascot_ballot.md 2018-06-14 21:22:25 -05:00
Josh Cincinnati 1b2f959385 approval voting update 2018-06-14 22:16:01 -04:00
Josh Cincinnati 544fe68706
Merge pull request #31 from realcodywburns/patch-1
movement to vote on mascot
2018-06-15 01:32:18 +00:00
Cody Burns bb8478d987
movement to vote on mascot
adding images and removing sample ballot text
2018-06-14 13:12:27 -05:00
Josh Cincinnati 14c71d30ff typo fix 2018-06-14 12:20:12 -04:00
Josh Cincinnati 1ebe357362 adds jia 2018-06-14 12:03:52 -04:00
Josh Cincinnati ecb71ac4d5
Merge pull request #30 from moeadham/master
Update moe_adham_nomination.md
2018-06-14 15:57:33 +00:00
Moe f49d92e43c
Update moe_adham_nomination.md 2018-06-14 10:35:48 -04:00
Josh Cincinnati 3796c4390c
Merge pull request #18 from zkpoof/master 2018-06-14 02:56:49 +00:00
Josh Cincinnati 891537d39c
Update monetary-policy.md 2018-06-13 22:55:28 -04:00
Josh Cincinnati 7ac477e214
Update and rename improve-taxes.md to monetary-policy.md 2018-06-13 22:55:18 -04:00
Josh Cincinnati e5d2194aad
Merge pull request #21 from acityinohio/master
Ballot Proposal: Embracing Simple PoW and ASICs
2018-06-14 02:43:42 +00:00
Josh Cincinnati cc0e582c9e
Merge pull request #14 from hloo/patch-2
Create chain_forks.md
2018-06-14 02:42:25 +00:00
Josh Cincinnati 0dfdff416b
Merge pull request #1 from amiller/amiller-asicmining-ballot
Create asicresistance_ballot.md
2018-06-14 02:36:41 +00:00
Josh Cincinnati fdd40ba641
Merge pull request #28 from acityinohio/arianna-nomination
adds arianna simpson nomination
2018-06-14 02:23:21 +00:00
Josh Cincinnati 0eae1372a9
Merge pull request #16 from boymanjor/master
Boyma Fahnbulleh self nominaton
2018-06-14 02:22:56 +00:00
Josh Cincinnati 24ca1e792f
Merge pull request #15 from PaulGuarda/patch-1
Sokolov Selfnomination
2018-06-14 02:20:04 +00:00
Josh Cincinnati 5006868ff1 restore sample nomination 2018-06-13 22:19:36 -04:00
Josh Cincinnati 11f0005347
Merge pull request #9 from lwsnbaker/master
create_lawson_baker_zcash_foundation_nomination.md
2018-06-14 02:15:17 +00:00
Josh Cincinnati 325b5490d4
Merge pull request #6 from finpunk/patch-1
Create finpunk-nomination
2018-06-14 02:14:54 +00:00
Josh Cincinnati 45d9e7cebb
slight fixes 2018-06-13 22:14:11 -04:00
Josh Cincinnati d074898fa0
Merge pull request #8 from amberella/master
Create amber_baldet_nomination.md
2018-06-14 02:10:52 +00:00
Josh Cincinnati ff7eb03607
Merge pull request #7 from moeadham/master
Self nomination: Moe Adham
2018-06-14 02:10:30 +00:00
Josh Cincinnati 3a91fedf4f
Merge pull request #4 from hloo/patch-1
Howard Loo nomination
2018-06-14 02:10:08 +00:00
Josh Cincinnati 63654d84f0
Merge pull request #3 from imichaelmiers/master
Create ian_miers_nomination.md
2018-06-14 02:09:53 +00:00
Josh Cincinnati 240ded2ce1
Merge pull request #29 from sonyamann/patch-11
Add Vladimir + rejection
2018-06-13 14:43:46 +00:00
Sonya Mann e2e58214aa
Add Vladimir + rejection 2018-06-12 13:25:43 -07:00
Josh Cincinnati 1a05eca514 update wording 2018-06-12 14:24:15 -04:00
Howard Loo 43dfab594a
Update chain_forks.md
Added answers to Zooko's questions regarding "where the bounds of the Zcash Foundation's authority lie."
2018-06-11 16:12:17 -07:00
Josh Cincinnati 41ee25eab8 adds arianna nomination 2018-06-09 19:12:05 -04:00
Josh Cincinnati 0d089741f3
Merge pull request #27 from sonyamann/patch-10
Howard Loo attestation
2018-06-08 12:20:16 +00:00
Howard Loo c874cabde0
Update chain_forks.md
Changed ballot measure choices to be the more traditional "yes" and "no" instead of "agree" and "disagree."
2018-06-08 01:28:58 -07:00
Howard Loo 46ac97633d
Update chain_forks.md
Change language in Motivation section to reflect the amended ballot measure.
2018-06-08 01:16:17 -07:00
Sonya Mann 60ffff5821
Howard Loo attestation 2018-06-08 00:52:11 -07:00
Josh Cincinnati 8bbd3ce616
Merge pull request #26 from sonyamann/patch-9
Add Hershy Ash, William Brown, and Louis Mareschi
2018-06-08 02:06:37 +00:00
Sonya Mann 33aee1c6a4
Add Hershy Ash, William Brown, and Louis Mareschi 2018-06-07 18:03:29 -07:00
Josh Cincinnati 03f471b903
Merge pull request #25 from sonyamann/patch-8
Add Aaron Orelup attestation
2018-06-07 03:20:10 +00:00