summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * setup.cfg is unusedBob Ippolito2011-09-041-3/+0
|/
* Merge branch 'namedtuple-object-gh6'Bob Ippolito2011-09-0411-42/+279
|\
| * 2.2.0 - namedtuple_as_object and tuple_as_array options, use_decimal now True...namedtuple-object-gh6Bob Ippolito2011-09-0411-39/+270
| * update docs with namedtuple encoding to JSON objectBob Ippolito2011-09-033-3/+9
|/
* Merge branch 'scan-ValueError-gh15'Bob Ippolito2011-09-034-2/+26
|\
| * also test unicode and fix the JSONDecodeError issuescan-ValueError-gh15Bob Ippolito2011-09-033-10/+20
| * ignore coverage filesBob Ippolito2011-09-031-0/+2
| * test case for https://github.com/simplejson/simplejson/issues/15Bob Ippolito2011-09-031-0/+12
|/
* document JSONDecodeError https://github.com/simplejson/simplejson/issues/12Bob Ippolito2011-06-222-5/+52
* Force unicode linebreak characters to be escaped (U+2028 and U+2029)Bob Ippolito2011-05-153-1/+15
* Move docs to http://simplejson.readthedocs.org/ and update version to 2.1.7Bob Ippolito2011-05-088-13/+10
* update docsv2.1.6Bob Ippolito2011-05-081-5/+5
* add a release dateBob Ippolito2011-05-081-1/+1
* Merge branch 'recursion_control-11'Bob Ippolito2011-05-082-95/+144
|\
| * encoder_listencode_obj recursion checkrecursion_control-11Bob Ippolito2011-05-071-1/+2
| * encoder_listencode_obj recursion checkBob Ippolito2011-05-071-73/+71
| * scan_once_unicode recursion checkBob Ippolito2011-05-071-10/+34
| * scan_once_str recursion checkBob Ippolito2011-05-072-10/+36
|/
View Lorry Controller Status