| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #107 from simplejson/sort_keys_dump-106v3.6.4 | Bob Ippolito | 2014-09-29 | 5 | -8/+26 |
| |\ | | | | | Fix dump's implementation of sort_keys | ||||
| | * | failing test for #106 | Bob Ippolito | 2014-09-29 | 1 | -0/+9 |
| | | | |||||
| | * | update version for v3.6.4 | Bob Ippolito | 2014-09-29 | 4 | -3/+8 |
| | | | |||||
| | * | ensure cached encoder is only used when all settings are defaultsort_keys_dump-106 | Bob Ippolito | 2014-09-24 | 1 | -5/+9 |
| |/ | |||||
| * | documentation about key limitations in JSON per #103v3.6.3 | Bob Ippolito | 2014-08-18 | 5 | -6/+20 |
| | | |||||
| * | doc updates from http://bugs.python.org/issue21514 re: #102v3.6.2 | Bob Ippolito | 2014-08-09 | 5 | -19/+84 |
| | | |||||
| * | Merge branch 'docs-102'v3.6.1 | Bob Ippolito | 2014-08-09 | 5 | -42/+224 |
| |\ | |||||
| | * | update documentation per #102docs-102 | Bob Ippolito | 2014-08-09 | 5 | -42/+224 |
| |/ | |||||
| * | forgot how to reST apparently | Bob Ippolito | 2014-07-22 | 1 | -2/+2 |
| | | |||||
| * | make note of the python2.2 branch | Bob Ippolito | 2014-07-22 | 1 | -0/+6 |
| | | |||||
| * | v3.6.0v3.6.0 | Bob Ippolito | 2014-07-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'sporty-master' | Bob Ippolito | 2014-07-21 | 5 | -4/+25 |
| |\ | |||||
| | * | generalize BOM stripping to any use of raw_decode | Bob Ippolito | 2014-07-21 | 6 | -24/+24 |
| | | | |||||
| | * | strip utf-8 bom. | Ryo Takahashi | 2014-07-21 | 3 | -1/+22 |
| |/ | |||||
| * | Fix lower bound checking in scan_once / raw_decode API #98v3.5.3 | Bob Ippolito | 2014-06-24 | 8 | -5/+30 |
| | | |||||
| * | update version for v3.5.2v3.5.2 | Bob Ippolito | 2014-05-23 | 4 | -3/+8 |
| | | |||||
| * | Merge pull request #97 from mindw/vs2008_build_fx | Bob Ippolito | 2014-05-23 | 1 | -1/+1 |
| |\ | | | | | fix build for VS 2008 | ||||
| | * | fix build for VS 2008 | Gabi Davar | 2014-05-23 | 1 | -1/+1 |
| |/ | |||||
| * | consistently reject int_as_string_bitcount <= 0 #96v3.5.1 | Bob Ippolito | 2014-05-22 | 7 | -4/+18 |
| | | |||||
| * | detabv3.5.0 | Bob Ippolito | 2014-05-21 | 1 | -101/+101 |
| | | |||||
| * | clean up #96 and prep for v3.5.0 release | Bob Ippolito | 2014-05-21 | 7 | -33/+53 |
| | | |||||
| * | Merge pull request #96 from coldeasy/int_as_string_bitcount | Bob Ippolito | 2014-05-20 | 6 | -118/+282 |
| |\ | | | | | Adding `int_as_string_bitcount` option | ||||
| | * | Allocate int_as_string bounds once per encoder | Colin Deasy | 2014-05-20 | 2 | -32/+38 |
| | | | |||||
| | * | Adding `int_as_string_bitcount` option | Colin Deasy | 2014-05-14 | 6 | -104/+262 |
| | | | |||||
| * | | fix arg check for item_sort_key | Bob Ippolito | 2014-05-20 | 1 | -1/+3 |
| |/ | |||||
| * | Merge pull request #95 from DanielBaird/patch-1 | Bob Ippolito | 2014-05-06 | 1 | -2/+0 |
| |\ | | | | | doc update: cleaned up double-paste in separators description. | ||||
| | * | cleaned up double-paste in separators description. | Daniel Baird | 2014-05-07 | 1 | -2/+0 |
| |/ | |||||
| * | fix tests to run on Python 3.4 | Bob Ippolito | 2014-04-30 | 5 | -40/+52 |
| | | |||||
| * | Merge pull request #94 from hugovk/patch-1 | Bob Ippolito | 2014-04-30 | 1 | -0/+1 |
| |\ | | | | | Travis CI now has Python 3.4 | ||||
| | * | Travis CI now has Python 3.4 | Hugo | 2014-04-30 | 1 | -0/+1 |
| |/ | | | http://blog.travis-ci.com/2014-04-28-upcoming-build-environment-updates/ | ||||
| * | bump to v3.4.0v3.4.0 | Bob Ippolito | 2014-04-02 | 4 | -9/+9 |
| | | |||||
| * | Merge pull request #92 from Infinidat/master | Bob Ippolito | 2014-04-02 | 1 | -1/+4 |
| |\ | | | | | bringing back setuptools (bdist_egg build support), but only if already present | ||||
| | * | bringing back bdist_egg build support | Guy Rozendorn | 2014-04-02 | 1 | -1/+4 |
| |/ | |||||
| * | improve Python 3.3 compat #87, bump to 3.3.3v3.3.3 | Bob Ippolito | 2014-02-14 | 6 | -8/+16 |
| | | |||||
| * | add comment about setuptools usage #85 | Bob Ippolito | 2014-02-10 | 1 | -0/+5 |
| | | |||||
| * | travis no longer supports python2.5 | Bob Ippolito | 2014-01-06 | 1 | -1/+0 |
| | | |||||
| * | update CHANGES.txt for v3.3.2v3.3.2 | Bob Ippolito | 2014-01-06 | 4 | -4/+9 |
| | | |||||
| * | Merge pull request #82 from JuhaS/patch-1 | Bob Ippolito | 2013-10-31 | 1 | -1/+1 |
| |\ | | | | | Documentation fix for decoded string types | ||||
| | * | Documentation fix for decoded string types | JuhaS | 2013-10-31 | 1 | -1/+1 |
| |/ | |||||
| * | update metadata for 3.3.1v3.3.1 | Bob Ippolito | 2013-10-05 | 4 | -3/+8 |
| | | |||||
| * | Merge pull request #78 from idank/master | Bob Ippolito | 2013-10-05 | 2 | -1/+20 |
| |\ | | | | | fix pickle breakage with JSONDecodeError | ||||
| | * | fix pickle breakage with JSONDecodeError | Idan Kamara | 2013-10-05 | 2 | -1/+20 |
| |/ | | | | | pickle doesn't behave correctly with custom Exceptions, we workaround the issue by explicitly defining how to pickle JSONDecodeError. | ||||
| * | pass-through in decoder for lone surrogates #62v3.3.0surrogate-62baserock/morph | Bob Ippolito | 2013-05-07 | 8 | -101/+123 |
| | | |||||
| * | update release datev3.2.0 | Bob Ippolito | 2013-05-01 | 1 | -1/+1 |
| | | |||||
| * | ignore_nan #63ecma-262-63 | Bob Ippolito | 2013-05-01 | 7 | -47/+112 |
| | | |||||
| * | update CHANGES and testsfor_json-69 | Bob Ippolito | 2013-05-01 | 3 | -75/+53 |
| | | |||||
| * | make argument order for c_make_encoder match make_iterencode | Bob Ippolito | 2013-05-01 | 2 | -4/+4 |
| | | |||||
| * | Version bump to 3.2.0 for the hell of it. | shakefu | 2013-04-20 | 1 | -1/+1 |
| | | |||||
| * | Implement for_json kwarg; pure Python version; add tests; update documentation. | shakefu | 2013-04-17 | 5 | -39/+210 |
| | | |||||
| * | Initial stab at for_json hook for C extension. | shakefu | 2013-04-17 | 1 | -0/+27 |
| | | |||||
 |
index : delta/simplejson.git | |
| github.com: simplejson/simplejson.git |
| summaryrefslogtreecommitdiff |