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 take two #292

Closed
wants to merge 611 commits into from
Closed

Merge take two #292

wants to merge 611 commits into from

Conversation

timmytofu
Copy link
Contributor 

git checkout upstream/master
git checkout -b from-upstream
git merge --strategy=ours master
git checkout master
git checkout -b merge-take-two
git merge from-upstream
git push -u origin merge-take-two

Let's see if that does better

Clark Gaebel and others added 30 commits October 25, 2012 15:52
Used realToFrac instead of toRational . fromRational.
558d4b7
@basvandijk
Added functions for inspecting Values
7b049f6
@basvandijk
Rewrite some parseJSON methods in terms of the new with* functions
36b70c1
@chrisdone
Add elaborate guide to Data.Aeson's Haddock documentation.
8f78ea2
@bos
Merge
f2bb853
@bos
Add a test case for haskellgh-72
80e5147
@bos
Merge
48a750f
@bos
Merge pull request haskell#89 from wowus/master
69130db 
Added an instance for the 'Fixed' class.
@bos
Merge pull request haskell#64 from mike-burns/iso-8601
4529c6a 
parseJSON for the variations on ISO-8601 dates as listed in ECMA-262.
@bos
Move deriving Eq ZonedTime to a safer place
bb57444
@bos
Match prevailing coding style
2f1d5cf
@bos
Merge pull request haskell#90 from basvandijk/with
32e0c2d 
Add functions for inspecting Values
@bos
Merge pull request haskell#69 from basvandijk/eitherDecode
1fd60bc 
Added eitherDecode and eitherDecode'
@bos
Merge pull request haskell#91 from chrisdone/master
4a3d1a1 
Add elaborate guide to Data.Aeson's Haddock documentation
@bos
Update Chris's docs
d6c61a1
@tibbe
Improve introductionary documentation
ed16167 
De-emphasize working directly with the Value type as this is not the
common (or recommended) way to use the library, but still include
documentation on how to use it when it's called for.

Since the documentation on using generics is documented in the FromJSON
and ToJSON classes, refer to that documentation instead of only
documenting one method (which is not the preferred method anymore with
default signatures I believe).
@bos
Switch over to new hashable interface
b990998
@bos
Update release notes
f21a88b
@bos
Bump version number
54752df
@bos
Update copyright years
26d57ef
@bos
Merge pull request haskell#96 from tibbe/docs
83a2433 
Improve introductionary documentation
@basvandijk
Add support for specifying how to encode datatypes in Data.Aeson.TH
2dff7be 
Fixes haskell#68 and fixes haskell#66.
@bos
Complex doc merge
2539e74
@bos
Added tag 0.6.1.0 for changeset b1770e9401a9
cc5526f
@nikita-volkov
Bring out the Generic Maybe bug in tests
3dc1c44
@nikita-volkov
Fix the Maybe being treated as ADT in Generics bug
f7e4916
@snoyberg
modifyFailure (haskell#104)
34d4636
@bos
Simplify the definition of modifyFailure
4e299b6
@bos
Merge pull request haskell#97 from basvandijk/th-encoding
4607d7d 
Add support for specifying how to encode datatypes in Data.Aeson.TH
@bos
Fix imports
09c8e43
bos and others added 27 commits May 13, 2014 21:26
@bos
Merge
c75bf45
@bos
Merge
f799cb9
@tekul
Export 'camelTo' function and fix its tests
0571ba4
@bos
Added tag 0.7.0.4 for changeset ea18d6545a48
c78cc97
@bos
Bump versiob to 0.8.0.0
50d47d4
@bos
Merge from 0.7 branch
19c0ac5
@bos
Constrain the bounds on attoparsec and scientific
5eaab83 
--HG--
extra : amend_source : d48e612e53488f41b0d6f2ceb4395978b48d411d
@bos
Bump attoparsec dep
119a327 
--HG--
extra : amend_source : aa3ad961a2c62e2948ee0e213615c01ac002b42c
@bos
Added tag 0.7.0.5 for changeset 3bfd2588b31f
401f51a
@basvandijk
Actually fix the DoS vulnerability by using the scientific parser
6fdecb1
@bos
Bump version to 0.7.0.6
354055c
@bos
Added tag 0.7.0.6 for changeset 743be245cdfa
73d893b
@bos
Merge from 0.11
3a0642b
@TomMD
Test the version of template haskell, not GHC
a6f3870 
This is more portable between compilers as well as between variants on GHC (ex: HaLVM is building off of head so GHC appears as 7.8.3 while TH is 2.10).
@bos
Merge pull request haskell#200 from liyang/master
49a13d2 
Data.Aeson.Types.Instances: fix UTCTime for years outside of [0, 9999]
@bos
Merge pull request haskell#199 from ret/patch-1
8cb4af2 
Modernizing the TH example.
@bos
Merge pull request haskell#204 from tekul/master
cdbdd27 
Export 'camelTo' function and fix its tests
@bos
Support up to 10-tuple FromJSON and ToJSON instances
8bc3d4f
@bos
So much boilerplate: 15-tuple FromJSON and ToJSON instances
708e922
@bos
Update changelog
5ab8aba
@bos
Added tag 0.8.0.0 for changeset 61bfbaca07c4
78e705b
@basvandijk
Support time-1.5
730a8c4
@basvandijk
Bump version to 0.8.0.1
2a38ffa
@basvandijk
Hide deprecations warnings caused by attoparsec >= 0.12
5f2cd3e
@lambda-fairy
Fix 15-tuple instances
73c4707
@basvandijk
Bump version to 0.8.0.2
67ea649
@timmytofu
Merge branch 'master' into HEAD
8f04524
@timmytofu
Copy link
Contributor Author

Whoops, meant to merge into self, sorry!

@timmytofu timmytofu closed this Sep 23, 2015
@timmytofu timmytofu deleted the merge-take-two branch September 25, 2015 01:12
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.

None yet