Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop back to master #1379

Merged
merged 47 commits into from
Dec 5, 2023
Merged

Merge develop back to master #1379

merged 47 commits into from
Dec 5, 2023

Conversation

mrmr1993
Copy link
Member

@mrmr1993 mrmr1993 commented Dec 4, 2023

No description provided.

dannywillems and others added 30 commits August 30, 2023 19:05
@dannywillems
Add link to GitHub
4f1a904
@dannywillems
This TODO is done
5e91825
@mrmr1993
Add helpers for inferring feature flags
99b35be
@mrmr1993
Derive binding types for FeatureFlags
33252de
@volhovm
[#14070] Add a unit check for the table id zero value condition
488ad18
@volhovm
[#14070] Fix the table dummy rows bug
74b5b0c
@volhovm
[#14097,#14070] Move lookup table consistency checks into LookupTable…
eaf3184 
…#create()
@volhovm
Cosmetics on the lookup RFC
2cf2ea4
@volhovm
Capitalize book summary titles
c5d1459
@volhovm
Add .ignore file to .gitignore
d71b06b
@volhovm
Improve RFC3, fix rendering in kimchi/overview.md
51e2672
@rbonichon
Cargo: use wasm-bindgen 0.2.87
f38a2c3
@dannywillems
Merge pull request #1302 from o1-labs/rb/wasm-bindgen-0.2.87
57a3d8b 
Cargo: use wasm-bindgen 0.2.87
@dannywillems
Merge pull request #1292 from o1-labs/volhovm/rfc3-cosmetics
ab79316 
Cosmetics on the book/lookups
@volhovm
Initially move sections around [MinaProtocol/mina#14442]
81f1296
@dannywillems
Bump up actions/@checkout to 4.1.1
992448e
@dannywillems
Merge pull request #1316 from o1-labs/dw/update-actions-to-4.1.1-develop
b66e145 
[Develop] update actions to 4.1.1
@volhovm
[#14097,#14070] Enforce using constructor through private fields
251ab0c
@volhovm
Formatting
cb46062
@volhovm
[#14097,#14070] Fix lookup test creating invalid id=0 zero table
e3aceaf
@volhovm
Add table id collision assertions to LookupConstraintSystem#create
1fac311
@volhovm
Improve lookup collision checks, fixed broken tests
d0e5de6
@volhovm
Add a test for lookup table id collisions
64e9155
@volhovm
Address PR comments [MinaProtocol/mina#14070]
2121c7f
@volhovm
Revert HashSet<LookupTable<_>> changes
d79015d
@volhovm
Consistency pass on book chapters / styling
2bcd3db
@volhovm
Prettify sections more
73ae00a
@dannywillems
Merge pull request #1275 from o1-labs/feature/infer-features-from-gates
ab36dce 
Add helpers for inferring feature flags
@dannywillems
Merge branch 'develop' into misc/link-todo-with-gh-issues
e9250aa
@dannywillems
Add TODO link
a285216
mrmr1993 and others added 17 commits November 16, 2023 13:36
@mrmr1993
Deduplicate lookup tables
da65a25
@dannywillems
Merge pull request #1334 from o1-labs/feature/deduplicate-lookup-table
88c1776 
Deduplicate lookup tables
@volhovm
Merge branch 'develop' into volhovm/mina14070-table-id-zero-row
c8ebc93
@dannywillems
Merge pull request #1263 from o1-labs/volhovm/mina14070-table-id-zero…
7f6eba0 
…-row

Lookups: Improve assertions and tests regarding empty rows and table duplicates
@volhovm
Merge pull request #1304 from o1-labs/volhovm/mina14442-move-old-rfcs…
2f94807 
…-chapters

Revamp mina book structure
@dannywillems
Bare URL's are not supported and must be wrapped.
8920a01
@dannywillems
Update specifications
25156a2 
Run make build
@dannywillems
Merge pull request #1200 from o1-labs/misc/link-todo-with-gh-issues
901033a 
Explain TODOs
@dannywillems
Fix resolver warnings
6c6adca 
https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
Merge pull request #1348 from o1-labs/dw/fix-resolver-warnings-develop
3908626 
[develop] Fix resolver warnings
@dannywillems
Additional comment on the table_id_combiner
1c30635
@dannywillems
Merge pull request #1355 from o1-labs/dw/additional-comments-on-combi…
bde1c05 
…ne-table-develop

Additional comment on the table_id_combiner [develop]
@mrmr1993
Revert "Merge pull request #1263 from o1-labs/volhovm/mina14070-table…
267105a 
…-id-zero-row"

This reverts commit 7f6eba0, reversing
changes made to 88c1776.
@mrmr1993
Merge pull request #1378 from o1-labs/feature/revert-bad-par
5685f41 
Revert bad PR #1263
@mrmr1993
Merge branch 'master' into merge-back-to-master
862d172
@mrmr1993
Merge branch 'develop' into merge-back-to-master
9a999cf
@mrmr1993
Reintroduce comment
b88e61c
@mrmr1993 mrmr1993 merged commit 6233800 into master Dec 5, 2023
5 checks passed
@mrmr1993 mrmr1993 deleted the merge-back-to-master branch December 5, 2023 05:51
@volhovm volhovm mentioned this pull request Dec 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mrmr1993 @dannywillems @volhovm @rbonichon