summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Specify JSON module interfacerfc-7159-jsonFlorian Frank2015-06-151-2/+1
* Disallow usage of symbolize_names and create_additionsFlorian Frank2015-06-155-18/+35
* Ext parser is green now as wellFlorian Frank2015-06-158-468/+240
* Refactor tests and make pure parser greenFlorian Frank2015-06-1522-810/+813
* Remove byte sniffing from Ext::ParserFlorian Frank2015-06-132-127/+57
* Remove generate restriction for […]/{…}Florian Frank2015-06-134-66/+3
* Remove byte sniffing from Pure::ParserFlorian Frank2015-06-131-33/+1
* Remove dependency on permutationFlorian Frank2015-06-134-23/+8
* Move common setup into test_helper.rbFlorian Frank2015-06-1314-24/+28
* Bump version to 1.8.3v1.8.3Florian Frank2015-06-015-4/+6
* use newest rubygemsFlorian Frank2015-06-012-2/+2
* Check 2.2.1 and 2.2.2 explicitelyFlorian Frank2015-06-011-0/+2
* Merge pull request #247 from nobu/potential_memory_leakFlorian Frank2015-05-295-34/+15
|\
| * generator.c: allocate structs with wrappernobu2015-05-282-11/+5
| * parser.rl: allocate structs with wrappernobu2015-05-283-23/+10
|/
* Merge pull request #245 from headius/patch-1Florian Frank2015-04-221-3/+3
|\
| * Fix mention of C extensions in READMECharles Oliver Nutter2015-04-211-3/+3
|/
* use ZALLOC if it can be used, and defined ZALLOC macro.SHIBATA Hiroshi2015-02-125-39/+54
* sync trunk again: fixed regression of r49027SHIBATA Hiroshi2015-02-122-9/+9
* Merge branch 'master' of storage.gate.ping.de:/git/jsonv1.8.2Florian Frank2015-01-090-0/+0
|\
| * Bump version number to 1.8.2Florian Frank2015-01-084-5/+5
| * Merge branch 'master' of github.com:flori/jsonFlorian Frank2015-01-083-4/+19
| |\
| | * Merge pull request #225 from mmacvicar/fix-space-beforeFlorian Frank2015-01-032-0/+14
| | |\
| | | * Make generator format test backwards compatibleMichael Mac-Vicar2014-12-071-1/+1
| | | * Use space_before as documented in the generatorMichael Mac-Vicar2014-12-071-0/+1
| | | * Add test for format options used by the generatorMichael Mac-Vicar2014-12-071-0/+13
| | * | Merge pull request #226 from bbrowning/runtimeinfo-contention-fixFlorian Frank2015-01-022-89/+91
| | |\ \
| | | * | Improve JRuby perf. by removing source of multithreaded contentionBen Browning2014-12-162-89/+91
| | | |/
| | * | Merge pull request #228 from JuanitoFatas/patch/travis-new-build-envFlorian Frank2015-01-021-0/+3
| | |\ \
| | | * | Use the new build env on Travis.Juanito Fatas2014-12-191-0/+3
| | | |/
| | * | Merge pull request #230 from jc00ke/patch-1Florian Frank2015-01-021-4/+2
| | |\ \ | | | |/ | | |/|
| | | * CI with current rbx-2Jesse Cooke2014-12-251-4/+2
| | |/
* | | Bump version number to 1.8.2Florian Frank2015-01-094-5/+5
* | | Add to CHANGESFlorian Frank2015-01-091-0/+9
* | | Make generator format test backwards compatibleMichael Mac-Vicar2015-01-091-1/+1
* | | Use space_before as documented in the generatorMichael Mac-Vicar2015-01-091-0/+1
* | | Add test for format options used by the generatorMichael Mac-Vicar2015-01-091-0/+13
* | | Use the new build env on Travis.Juanito Fatas2015-01-091-0/+3
* | | CI with current rbx-2Jesse Cooke2015-01-091-4/+2
|/ /
* | Merge branch 'ruby220' of https://github.com/hsbt/json into zzak-ruby-2.2zzak-ruby-2.2Florian Frank2015-01-030-0/+0
|\ \
| * | fix to build fail with rb_str_new macro usageSHIBATA Hiroshi2014-12-281-1/+1
| |/
* | Merge branch 'master' into zzak-ruby-2.2Florian Frank2015-01-027-94/+113
|\ \
| * | Improve JRuby perf. by removing source of multithreaded contentionBen Browning2015-01-022-89/+91
| * | Added ruby-head to travis allowed-failuresIain Beeston2015-01-021-0/+1
| * | Don't mutate JSON.dump_default_options from dumpJason R. Clark2015-01-022-1/+7
| * | No binstubsFlorian Frank2015-01-021-1/+1
| * | ReindentedFlorian Frank2015-01-021-7/+6
| * | Document `Rational` json generation methods.Vipul A M2015-01-021-4/+10
| * | Document `Complex` json generation methods.Vipul A M2015-01-021-1/+7
| * | Use method_defined? to check if method exists instead of slower check on inst...Vipul A M2015-01-021-1/+1