Commit Graph

41 Commits

Author SHA1 Message Date
Daira-Emma Hopwood 9cdb4c1c77 Regenerate PDFs.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-28 15:18:08 +01:00
Daira-Emma Hopwood cd82c2859a
Merge pull request #902 from nuttycom/zsf
[ZIP 233] Zcash Sustainability Fund
2024-08-27 19:07:24 +01:00
Kris Nuttycombe d0390262b5 [ZIP 233] Wrap and format math syntax. 2024-08-27 11:57:57 -06:00
Kris Nuttycombe f9838bfdf6 Move draft-zsf.md to zips/zip-0233.md 2024-08-27 11:45:41 -06:00
Daira-Emma Hopwood 2d8c904e8e Re-render ZIP 1015.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 18:37:54 +01:00
Daira-Emma Hopwood 54195b18d8 Add Kris Nuttycombe as a ZIP Editor.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 18:37:35 +01:00
Kris Nuttycombe a279a34c82 Merge remote-tracking branch 'upstream/main' into zsf 2024-08-27 11:34:13 -06:00
Kris Nuttycombe eb6f24f9bf
Merge pull request #898 from zcash/fpf-language
ZIP 1015: update FPF-related language
2024-08-27 11:11:30 -06:00
Conrado Gouvea da1abd5214 update constraint 1 per suggestion 2024-08-27 14:07:12 -03:00
Daira-Emma Hopwood d93d3f4c36 Re-render HTML.
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-27 10:56:50 +01:00
Kris Nuttycombe 57d0fe6501 Apply suggestions from code review
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
2024-08-26 17:12:34 -06:00
Conrado Gouvea e5c5b199ff ZIP 1015: update FPF-related language 2024-08-26 19:25:44 -03:00
Kris Nuttycombe e5dc216d0a Update ZIP 214 to include the ZIP 1015 funding streams as Revision 1
This includes some additional cleanup to definitions and wording
in ZIP 1015 to clarify required references in ZIP 214.
2024-08-26 14:20:21 -06:00
Kris Nuttycombe 92ed400b38 Restore the draft NU6 funding proposal that was voted on. 2024-08-26 14:03:07 -06:00
Kris Nuttycombe b6c7a2c421 draft-nuttycom-funding-allocation: Move the 20% lockbox proposal to previously considered alternatives.
The Zcash community has selected Alternative 1, the Hybrid Deferred Dev
Fund, for the behavior of the dev fund following the November 2024
halving. See the following posts for details:

https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/16
https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/17
https://forum.zcashcommunity.com/t/dev-fund-decision-time/48231/27
2024-08-26 12:06:17 -06:00
Kris Nuttycombe c9df015564 draft-nuttycom-funding-allocation: Move alternatives 1 & 4 to "previously considerd" section.
This also renumbers the remaining alternatives to reflect the moves,
and updates the motivation for the 20% option such that it is does
not depend heavily on context provided by the other alternatives.
2024-08-26 11:56:15 -06:00
Kris Nuttycombe 4290ff9787 Render zip-0253 2024-08-26 11:35:49 -06:00
Jack Grigg c13d0639fd Render manually, while the CI-based rendering is broken 2024-08-13 17:49:25 +00:00
Jack Grigg b81dbf1bd9 Render manually, while the CI-based rendering is broken 2024-08-05 22:50:58 +00:00
Jack Grigg 0c39e5ef09
Merge pull request #891 from zcash/zip-236
Assign ZIP number 236 to draft-hopwood-coinbase-balance
2024-08-01 20:52:10 +01:00
Jack Grigg aaf81b843a Redirect /draft-hopwood-coinbase-balance to /zip-0236 2024-08-01 17:52:20 +00:00
Jack Grigg e485b1263d Assign ZIP 236 to draft-hopwood-coinbase-balance 2024-08-01 17:48:42 +00:00
Jack Grigg 732b3adab5 Fix redirect for ZIP 2001
`_config.yml` is deleted as it did not work, indicating that Jinja is
not being used at all for the ZIPs repo rendering.
2024-08-01 17:37:32 +00:00
Jack Grigg ede4b1cb32 Attempt to redirect `/draft-nuttycom-lockbox-streams` to `/zip-2001` 2024-08-01 15:00:15 +00:00
Jack Grigg 945da8d758 Assign ZIP 2001 to draft-nuttycom-lockbox-streams 2024-08-01 15:00:15 +00:00
Jack Grigg 6a55ee546c Move _config.yml into the subdirectory we are rendering
This was missed in the refactor PR.
2024-07-30 22:03:07 +00:00
Jack Grigg b00814bb1f
Merge pull request #882 from zcash/teor-resigns
Remove teor and Aditya Bharadwaj as ZIP editors
2024-07-30 23:00:43 +01:00
Jack Grigg 8ed75f93de Render manually, while the CI-based rendering is broken 2024-07-30 22:00:10 +00:00
Conrado Gouvea 6e6893d832 address comment, update spec ref, add paper ref 2024-07-19 21:54:01 -03:00
Conrado Gouvea d9b98e6a14 Merge remote-tracking branch 'upstream/main' into zip-frost 2024-07-19 18:29:52 -03:00
Jack Grigg ae9de0a26b Render manually, while the CI-based rendering is broken 2024-07-18 05:07:17 +00:00
Jack Grigg 94f654c2ec
Merge pull request #240 from daira/op-csv
Add ZIPs 68, 112, and 113 (OP_CHECKSEQUENCEVERIFY)
2024-07-17 15:55:08 +01:00
Jack Grigg cff34341ec
Merge pull request #426 from str4d/zip-0311
[ZIP 311] Zcash Payment Disclosures
2024-07-17 15:54:32 +01:00
Jack Grigg e96b057ae5 Move ZIPs 68, 112, and 113 into `zips/` subdirectory 2024-07-17 02:28:53 +00:00
Jack Grigg 2479dc18d1 ZIP 311: Add TODO for Orchard support 2024-07-17 02:16:01 +00:00
Jack Grigg f044cc57d6 Merge branch 'main' into zip-0311 2024-07-17 02:10:15 +00:00
Jack Grigg 771c358c34 Add separate tables for Released, Draft, and struck ZIPs
These make it easier to determine what is currently part of the Zcash
ecosystem, and what is still in progress. The original by-number index
is preserved at the bottom for reference.
2024-07-17 01:56:26 +00:00
Jack Grigg 1de446352c ZIP 315: Fix rendering issues 2024-07-16 20:12:58 +00:00
Jack Grigg 1bcece4f85 Move `CNAME` into `rendered/` subdir
AFAICT the file needs to be in the root of the GH Pages source
directory, which is now a subdirectory.
2024-07-16 19:52:16 +00:00
Jack Grigg 26f16f44ec Move ZIP source into `zips/` subdirectory
This makes the repo root more approachable for newcomers; the README can
be seen in GitHub immediately instead of after much scrolling.
2024-07-16 18:58:05 +00:00
Jack Grigg 080306b42a Move files rendered for zips.z.cash into a subdirectory
All content that is reachable via links on zips.z.cash is moved into
this directory, so that GitHub Pages can be configured to build the site
from it. This includes non-generated files like CSS that are required
for correct site presentation.
2024-07-16 18:52:47 +00:00