Commit Graph

7 Commits

Author SHA1 Message Date
Daira Hopwood 642f7c6f1a ZIP 1014: clarify language around the criteria for awarding Major Grants.
No normative changes intended, other than removal of "new" in
item 4, which conflicts with the "maintain the existing teams
and capabilities" goal of this ZIP.

Originally
* 517562aae3
* f7277c6777

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 15:54:24 +00:00
Daira Hopwood e6a5a5380c ZIP 1014: clarify how Volatility Reserve is managed and by whom.
Originally 8ab85986be

Co-Authored-By: Eran Tromer <eran@tromer.org>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 14:07:16 +00:00
Daira Hopwood 46690175b9 ZIP 1014: rename Community Advisory Panel to Community Panel.
Originally 6ad20895a4

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:45:07 +00:00
Daira Hopwood 08f48b1b9b ZIP 1014: copyediting from Daira's review.
Originally
* c093569d53
* e7ddc76496
* deae965edc
* bac8679e83
* 2d6645b732

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:39:23 +00:00
Daira Hopwood f20542877c ZIP 1014: ECC may distribute Dev Fund proceeds in fair-market-value compensation to contractors, as well as employees.
Originally 3558d34601

Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
Co-Authored-By: Josh Cincinnati <acityinohio@users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:31:45 +00:00
Daira Hopwood cfe18281eb ZIP 1014: wording updates; volatility reserve is per organization.
Deletes "ZF may award grants as profit-sharing contracts".
Adds "The ECC will not be eligible for Major Grants if they have any funds available in their slice's Volatility Reserve" (which is later deleted).
Transfers responsibility for Major Grants awards from the ZF Board of Directors to a separate committee.

Originally 025dc79858

Co-Authored-By: Josh Cincinnati <acityinohio.users.noreply.github.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:26:28 +00:00
Daira Hopwood cafed14a2e Create ZIP 1014 from ZIP 1012.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-01-07 11:04:07 +00:00