13237c3Revert "Generalize merge"Matthew Bauer7 years ago b3ad64aRevert "Less unsafeCoerce (#322)"Matthew Bauer7 years ago 8064382Revert "Distribute more generally"Matthew Bauer7 years ago 04403d3Revert "Generalize fan following DMap (#318)"Matthew Bauer7 years ago 123b62eRevert "Use unsafePerformIO better (#325)"Matthew Bauer7 years ago c5e2ecdRevert "Fix merges (#340)"Matthew Bauer7 years ago 7e7afe1Merge branch 'semialign-1.1' into db@patch-dmap-and-semialignDan Bornside7 years ago 74c1db3Support semialign-1.1Oleg Grenrus7 years ago 732cb14Update src/Reflex/Patch/Patchable.hsDan Bornside7 years ago d66d5e9add a couple of types for working with patchesDan Bornside7 years ago 55a1e29Merge pull request #355 from saulzar/fix-loopingOliver Batchelor7 years ago a5bee16Use correct module qualification this timeOliver Batchelor7 years ago 1b8371bMerge pull request #354 from saulzar/fix-loopingOliver Batchelor7 years ago 44fae82Fix broken recursive looping instanceOliver Batchelor7 years ago 657973dMerge pull request #351 from reflex-frp/aa-monoidal-containers-0.6v0.6.2.4Ali Abrar7 years ago c809ee6Merge branch 'develop' into aa-monoidal-containers-0.6Ali Abrar7 years ago eb70babMerge branch 'release/0.6.2.3' of github.com:reflex-frp/reflexAli Abrar7 years ago 5480222Update to monoidal-containers 0.6, avoid 0.5Ali Abrar7 years ago 9b684dev0.6.2.3 - Add an upper-bound to witherablev0.6.2.3Ali Abrar7 years ago 710c850Use align (a merge) instead of coincidence for <.> (#346)Oliver Batchelor7 years ago 3a6f208Merge pull request #263 from reflex-frp/dn-add-test-folddynOliver Batchelor7 years ago 7ae1e23Merge branch 'develop' into dn-add-test-folddynOliver Batchelor7 years ago 5fca658Merge pull request #348 from phadej/haskell-ci-regenerateOliver Batchelor7 years ago 5bba840Allow witherable ==0.3.*Oleg Grenrus7 years ago 6173df4Use haskell-ci regenerateOleg Grenrus7 years ago b941f83Update .travis.ymlOliver Batchelor7 years ago 0b52dc4Add freeze file to avoid text 1.2.4.0 duplicate instances (#347)Oliver Batchelor7 years ago a740f3dMerge pull request #342 from reflex-frp/aa-fix-defaultnixOliver Batchelor7 years ago 2305724default.nix: Add missing profunctors depAli Abrar7 years ago c6259c8Merge pull request #336 from reflex-frp/phadej-haskell-ciOliver Batchelor7 years ago bf8a772Use xenial and manually install node 8 for ghcjsOliver Batchelor7 years ago 4638a6fMerge branch 'develop' into phadej-haskell-ciOliver Batchelor7 years ago eeeae5fFix merges (#340)Oliver Batchelor7 years ago 88d12d9Merge branch 'develop' into phadej-haskell-ciAli Abrar7 years ago 0bf106acontributing: add note on dependency ver boundsAli Abrar7 years ago dc295b0travis-ci: Add ghcjs to allowed failures list bc of travis time limitAli Abrar7 years ago 5e037c0Less unsafeCoerce (#322)David Feuer7 years ago d60fcbatravis: disable benchmarksAli Abrar7 years ago bb75a4bchangelog: document v0.6.2.2Ali Abrar7 years ago 70b7bebci: Fix travis configAli Abrar7 years ago 28b4addcabal: Avoid hlint 2.1.*Ali Abrar7 years ago afd4462cabal: Limit witherable versionAli Abrar7 years ago 3ca5d07ci: Remove cabal.project.local before buildingAli Abrar7 years ago e490ca5hlint: More lintingAli Abrar7 years ago c31bec2cabal: remove some version boundsAli Abrar7 years ago 0071805ci, cabal: Update to newly-released monoidal-containers-0.5.0.1Ali Abrar7 years ago 2c44f7acabal: More version bound adjustmentAli Abrar7 years ago 5fc6f14cabal: Tighten container version boundsAli Abrar7 years ago 9a63788Fix lint failures; Remove overridden dependent-mapAli Abrar7 years ago 8ea09b3default.nix: Default splitThese to false in absence of semialign packageAli Abrar7 years ago