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

Tezos reunification #22

Merged
merged 43 commits into from
Jan 26, 2019
Merged

Tezos reunification #22

merged 43 commits into from
Jan 26, 2019

Conversation

danbornside
Copy link
Contributor

@danbornside danbornside commented Oct 9, 2018 •
edited by 3noch
Loading

This is on top of both #16 and #17

danbornside and others added 30 commits August 15, 2018 17:10
@danbornside
trying to fix some datastructures issues
7548d81
@danbornside
use the workingest version of monoidal-containers
074dcb9
@3noch
Expose a known set of working overrides
19c07a9
@3noch
Merge remote-tracking branch 'origin/master' into db-fix-build-errors
750e963
@hSloan @luigy
remove Monoid( First( Maybe v)) from Monoid and Semigroup instances
7f9e320
@matthewbauer @luigy
Comment out prerender instance
6ebaa04 
This is incompatible with the older reflex-platform this is being
switched to.
@luigy
Add PrimMonad instance for RhyoliteWidget
edc6a9e
@srid @luigy
Allow the cookie functions to take a custom SetCookie
79864a3 
This allows to customize the cookie like setting a path for it.
@luigy
Add singleKnownPresence
321f717
@luigy
Merge fixup
8c1d93e
@3noch
Bump obelisk
701287d
@3noch
Move Backend.TH to Backend.DB.TH; clean up cabal files
262b141
@3noch
Pull Gargoyle-based backend functions into separate package
ceb5334
@luigy
Add ToJSONKey/FromJSONKey support
b905fa3
@luigy
Cleanup uneeded overrides
90f1546
@luigy
Bump groundhog
10f0186
@luigy
Merge remote-tracking branch 'origin/singleKnownPresence+db-fix-build…
dd97fff 
…-errors' into reunification
@ali-abrar @luigy
Ensure monad-logger isn't required on mobile; Remove Rhyolite.Map.Mon…
3e30fe7 
…oidal

(cherry picked from commit 62e5dba)
@luigy
Checkpoint
3ac3e40
@danbornside
bytestring-trie renamed some modules
212e989
@danbornside
add bytestring-trie and some other stuff...
58ffe51
@3noch
Add db-gargoyle to cabal project
bf5be49
@xplat
coalesce excessively frequent view updates
42d37a4
@3noch
Point to patched reflex in default.nix
16af33a
@danbornside
force all logging configs to be records instead of
3790259 
structured arrays so that future additions don't break existing configs.
@danbornside
export some missing types
be2dd04
@3noch
Use latest Reflex + fix duplicate instances
5c3d1bd
@3noch
Use branch of reflex with EventWriter fix and fancy throttle
82ae556
@Ericson2314
Add selectSingle, so no one is tempted to use listToMaybe
e2b58d9
@3noch
Bump obelisk and reflex
804f2e7
3noch and others added 13 commits November 13, 2018 15:15
@ali-abrar
Copy link
Member

This has been open for a long time. How can we get this merged? Are there any breaking changes?

@3noch
Copy link
Collaborator

3noch commented Jan 25, 2019 •
edited
Loading

@ali-abrar This includes the same changes from #25 so we'll have to at least deal with those conflicts. Also #27 is built on top of this?

@Ericson2314
Copy link
Member

Ericson2314 commented Jan 26, 2019 •
edited
Loading

Yes #27 includes all of this but my last commit to use aeon-gadt-th. Since that is conceptually separate, but depend on the Nix code changes in here, I'd turn this into a PR for just that and deem it blocked on #27 so we just re-review this once it becomes a small 1-commit PR.

@ali-abrar ali-abrar merged commit 5a529a0 into master Jan 26, 2019
@ali-abrar ali-abrar deleted the tezos-reunification branch November 20, 2021 19:00
ryantrinkle pushed a commit that referenced this pull request Sep 24, 2024
@cgibbard
Merge pull request 'jg/use-subtransactions-for-snapshot-protection' (#22
216bbc0 
) from jg/use-subtransactions-for-snapshot-protection into master

Reviewed-on: https://code.obsidian.systems/rhyolite/rhyolite/pulls/22
Reviewed-by: ryantrinkle <[email protected]>
Reviewed-by: Cale Gibbard <[email protected]>
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.
10 participants
@danbornside @ali-abrar @3noch @Ericson2314 @hSloan @matthewbauer @srid @luigy @xplat @alexfmpe