summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary conversionNobuyoshi Nakada2016-04-242-10/+8
* Use enumNobuyoshi Nakada2016-04-242-28/+29
* Use assert_raise consistentlyNobuyoshi Nakada2016-04-246-48/+48
* Remove useless methodsNobuyoshi Nakada2016-04-241-8/+0
* Append newline at EOFNobuyoshi Nakada2016-04-241-1/+1
* Merge pull request #278 from zeroed/masterFlorian Frank2016-04-061-75/+133
|\
| * Update README.md with formattingEdoardo Rossi2016-04-061-75/+133
|/
* Merge branch 'v1.8'Florian Frank2016-02-252-8/+0
|\
| * Use ~> 2.0 test-unit that runs on 1.8 rubies as wellFlorian Frank2016-02-254-8/+8
| * Only test main 2.2 branchFlorian Frank2016-02-251-3/+0
| * Move dependencies into gemspec filesFlorian Frank2016-02-255-5/+23
* | Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-02-250-0/+0
|\ \
| * \ Merge pull request #257 from sevenseacat/patch-1Florian Frank2015-08-211-0/+1
| |\ \
| | * | Also build against 2.2.3Rebecca Skinner2015-08-211-0/+1
| |/ /
* | | Use ~> 2.0 test-unit that runs on 1.8 rubies as wellFlorian Frank2016-02-254-0/+21
* | | Merge branch 'v1.8'Florian Frank2016-02-2525-552/+121
|\ \ \ | | |/ | |/|
| * | Check for existence of #to_json method before callFlorian Frank2016-02-252-3/+11
| * | Avoid system stack errorFlorian Frank2016-02-251-1/+1
| * | Remove permutation dependencyFlorian Frank2016-02-254-41/+2
| * | Be gone…Florian Frank2016-02-251-13/+0
| * | Attempt to switch jruby into 2.0 modeFlorian Frank2016-02-251-4/+3
| * | Add 2.3.0 for travis tetingFlorian Frank2016-02-251-0/+1
| * | Add missing testsFlorian Frank2016-02-251-0/+24
| * | Call OBJECT_HANDLER for objects without #to_jsonFlorian Frank2016-02-251-5/+8
| * | Correct CHANGESFlorian Frank2015-11-061-1/+2
| * | Convert README to markdownFlorian Frank2015-11-064-35/+35
| * | Fix some linksFlorian Frank2015-11-051-15/+4
| * | Skip 1.8.4Florian Frank2015-10-204-5/+5
| * | Add 2.2.3 explicitelyFlorian Frank2015-09-111-0/+1
| * | Remove sdoc and upgrade dependenciesFlorian Frank2015-09-113-25/+11
| * | Bump version to 1.8.4 and add to CHANGESFlorian Frank2015-09-113-2/+10
| * | Remove remnants of GPL licensesFlorian Frank2015-09-1117-482/+18
| |/
* | 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