summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* v3.8.2 - fix compiler warning, automated wheel builds for Windows and Macv3.8.2wheelsBob Ippolito2016-02-159-14/+139
* Merge pull request #130 from aebrahim/appveyorBob Ippolito2015-11-223-0/+232
|\
| * build windows wheels on appveyorAli Ebrahim2015-11-223-0/+232
|/
* Add Python 3.5 to Travis test suiteBob Ippolito2015-10-271-0/+1
* Fix issue with iterable_as_array and indent option, closes #128v3.8.1Bob Ippolito2015-10-274-22/+29
* Update version to 3.8.1Bob Ippolito2015-09-044-4/+9
* Merge pull request #123 from costypetrisor/fix-int_as_string_bitcount-from-sp...Bob Ippolito2015-09-041-1/+0
|\
| * removed from _speedups.c forgotten "iterable_as_array" without comma after s...Costy Petrisor2015-09-031-1/+0
|/
* clean up iterable_as_array for 3.8.0v3.8.0Bob Ippolito2015-07-186-12/+13
* Merge branch 'master' into iterable_as_array-gh1Nick Babcock2015-07-1043-1112/+3742
|\
| * fix typo in e18cc09v3.7.3Bob Ippolito2015-05-315-4/+9
| * attempt to work around an issue with reloading the Decimal modulev3.7.2Bob Ippolito2015-05-225-8/+16
| * bump version for #119v3.7.1Bob Ippolito2015-05-184-3/+8
| * Merge pull request #119 from cgohlke/patch-1Bob Ippolito2015-05-181-2/+4
| |\
| | * Fix msvc error C2275: 'PyObject' : illegal use of this type as an expressionChristoph Gohlke2015-05-181-2/+4
| |/
| * no longer trust custom repr for int/long/float subclasses #118v3.7.0Bob Ippolito2015-05-188-8/+101
| * Merge pull request #116 from d0ugal/patch-1Bob Ippolito2015-02-181-1/+1
| |\
| | * Fixed a typo in the docsDougal Matthews2015-02-181-1/+1
| |/
| * update CHANGES and bump version to v3.6.5v3.6.5Bob Ippolito2014-10-244-3/+9
| * Merge pull request #110 from kbussell/memoryleakBob Ippolito2014-10-241-0/+1
| |\
| | * Fix memory leak when an error occurs encoding dict itemsKeith Bussell2014-10-231-0/+1
| |/
| * Merge pull request #107 from simplejson/sort_keys_dump-106v3.6.4Bob Ippolito2014-09-295-8/+26
| |\
| | * failing test for #106Bob Ippolito2014-09-291-0/+9
| | * update version for v3.6.4Bob Ippolito2014-09-294-3/+8
| | * ensure cached encoder is only used when all settings are defaultsort_keys_dump-106Bob Ippolito2014-09-241-5/+9
| |/
| * documentation about key limitations in JSON per #103v3.6.3Bob Ippolito2014-08-185-6/+20
| * doc updates from http://bugs.python.org/issue21514 re: #102v3.6.2Bob Ippolito2014-08-095-19/+84
| * Merge branch 'docs-102'v3.6.1Bob Ippolito2014-08-095-42/+224
| |\
| | * update documentation per #102docs-102Bob Ippolito2014-08-095-42/+224
| |/
| * forgot how to reST apparentlyBob Ippolito2014-07-221-2/+2
| * make note of the python2.2 branchBob Ippolito2014-07-221-0/+6
| * v3.6.0v3.6.0Bob Ippolito2014-07-211-1/+1
| * Merge branch 'sporty-master'Bob Ippolito2014-07-215-4/+25
| |\
| | * generalize BOM stripping to any use of raw_decodeBob Ippolito2014-07-216-24/+24
| | * strip utf-8 bom.Ryo Takahashi2014-07-213-1/+22
| |/
| * Fix lower bound checking in scan_once / raw_decode API #98v3.5.3Bob Ippolito2014-06-248-5/+30
| * update version for v3.5.2v3.5.2Bob Ippolito2014-05-234-3/+8
| * Merge pull request #97 from mindw/vs2008_build_fxBob Ippolito2014-05-231-1/+1
| |\
| | * fix build for VS 2008Gabi Davar2014-05-231-1/+1
| |/
| * consistently reject int_as_string_bitcount <= 0 #96v3.5.1Bob Ippolito2014-05-227-4/+18
| * detabv3.5.0Bob Ippolito2014-05-211-101/+101
| * clean up #96 and prep for v3.5.0 releaseBob Ippolito2014-05-217-33/+53
| * Merge pull request #96 from coldeasy/int_as_string_bitcountBob Ippolito2014-05-206-118/+282
| |\
| | * Allocate int_as_string bounds once per encoderColin Deasy2014-05-202-32/+38
| | * Adding `int_as_string_bitcount` optionColin Deasy2014-05-146-104/+262
| * | fix arg check for item_sort_keyBob Ippolito2014-05-201-1/+3
| |/
| * Merge pull request #95 from DanielBaird/patch-1Bob Ippolito2014-05-061-2/+0
| |\
| | * cleaned up double-paste in separators description.Daniel Baird2014-05-071-2/+0
| |/
| * fix tests to run on Python 3.4Bob Ippolito2014-04-305-40/+52
| * Merge pull request #94 from hugovk/patch-1Bob Ippolito2014-04-301-0/+1
| |\