summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * add some more classifiers for pypiBob Ippolito2012-12-281-0/+9
| * fix python 2.5 test regressionBob Ippolito2012-12-281-1/+2
| * First pass at Python 3.3 compatibilityBob Ippolito2012-12-2824-364/+723
|/
* export JSONEncoderForHTML (#41), bump to v2.6.2v2.6.2Bob Ippolito2012-09-215-9/+12
* bump version to 2.6.1 and add test/docs for #38 raw_decode fixv2.6.1Bob Ippolito2012-07-276-7/+18
* Merge pull request #38 from japeq/masterBob Ippolito2012-07-271-3/+5
|\
| * raw_decode(): Skip whitespace before the objectJanne Kulmala2012-07-191-3/+3
| * raw_decode(): Document 'idx' parameterJanne Kulmala2012-07-191-0/+2
|/
* Error messages changed to match proposal for Python 3.3.1Bob Ippolito2012-06-267-22/+37
* Fix for regression introduced in 2.5.1v2.5.2Bob Ippolito2012-05-105-4/+9
* Support for use_decimal=True in sub-interpretersv2.5.1Bob Ippolito2012-05-107-22/+40
* Merge branch 'item_sort_key'v2.5.0Bob Ippolito2012-03-298-37/+153
|\
| * fix typoitem_sort_keyBob Ippolito2012-03-291-2/+2
| * bump version to 2.5.0, add docs for item_sort_keyBob Ippolito2012-03-298-36/+91
| * Merge remote-tracking branch 'scottkmaxwell/master' into item_sort_keyBob Ippolito2012-03-294-16/+77
| |\ |/ /
| * Added item_sort_keyScott Maxwell2012-03-204-16/+77
|/
* oops, fix release dateBob Ippolito2012-03-061-1/+1
* Merge branch 'bigint_as_string-gh31'v2.4.0Bob Ippolito2012-03-068-21/+155
|\
| * Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31bigint_as_string-gh31Bob Ippolito2012-03-061-2/+2
| |\
| | * Change 1 to 1LL to fix warningsScott Maxwell2012-03-061-2/+2
| |/
| * version and changelog bumpBob Ippolito2012-03-064-4/+10
| * fix edge cases and pre-2.7 compatibilityBob Ippolito2012-03-064-49/+108
| * Merge remote-tracking branch 'scottkmaxwell/master' into bigint_as_string-gh31Bob Ippolito2012-03-065-16/+85
| |\ |/ /
| * Integrated unit test into test suiteScott Maxwell2012-03-022-18/+1
| * Finalized bigint_as_string featureScott Maxwell2012-03-024-30/+79
| * Changed limits from 2^54 to 2^53Scott Maxwell2012-03-013-11/+11
| * Added javascript_safe_ints supportScott Maxwell2012-03-013-14/+51
|/
* bump to 2.3.3 and clean up indent codev2.3.3Bob Ippolito2012-02-275-10/+13
* Merge pull request #29 from kini/indent-eafpBob Ippolito2012-02-272-3/+45
|\
| * Documentation and a test for the previous commitKeshav Kini2012-02-282-2/+42
| * Allow unknown numerical types for indent parameterKeshav Kini2012-02-251-1/+3
* | attempt to support travisBob Ippolito2012-02-271-0/+5
|/
* fix 2.3.1 regression and bump version to 2.3.2v2.3.2Bob Ippolito2011-12-305-5/+9
* bump version in setup.pyv2.3.1Bob Ippolito2011-12-291-1/+1
* Merge branch 'dict-subclass-gh26'Bob Ippolito2011-12-296-46/+96
|\
| * callable check for _asdict with namedtuple_as_objectdict-subclass-gh26Bob Ippolito2011-12-296-42/+92
| * fix whitespaceBob Ippolito2011-12-291-4/+4
|/
* Merge branch 'namedtuple_duck-gh22'v2.3.0Bob Ippolito2011-12-058-19/+50
|\
| * Change release date for 2.3.0namedtuple_duck-gh22Bob Ippolito2011-12-051-1/+1
| * test with DucKValue and DuckPoint which are not tuple subclassesBob Ippolito2011-11-181-4/+24
| * bump version to 2.3.0Bob Ippolito2011-11-184-4/+10
| * update docsBob Ippolito2011-11-181-3/+11
| * Merge remote-tracking branch 'singingwolfboy/master' into namedtuple_duck-gh22Bob Ippolito2011-11-182-8/+5
| |\ |/ /
| * Removed PyTuple_Check from _is_namedtuple() in _speedups.cDavid Baumgold2011-11-101-1/+1
| * Removed isinstance() check for namedtuple_as_objectDavid Baumgold2011-11-101-7/+4
|/
* fix https://github.com/simplejson/simplejson/issues/16 - include MANIFEST.in ...v2.2.1Bob Ippolito2011-09-065-3/+9
* I knew I missed something. Fix the date in CHANGES.txtBob Ippolito2011-09-041-1/+1
* Merge branch 'pure-distutils'v2.2.0Bob Ippolito2011-09-048-312/+39
|\
| * fix tests for py2.5pure-distutilsBob Ippolito2011-09-041-0/+6
| * remove setuptoolsBob Ippolito2011-09-046-309/+33
View Lorry Controller Status