summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prepare version 1.7.6v1.7.6Florian Frank2012-12-314-10/+10
* Increase hash likeness of State objectsFlorian Frank2012-12-3114-51/+131
* Merge pull request #153 from shugo/masterFlorian Frank2012-12-131-1/+0
|\
| * Remove unnecessary GET_STATE(self) to avoid an unused-but-set-variable warnin...Shugo Maeda2012-12-131-1/+0
|/
* Change the CHANGESFlorian Frank2012-11-293-7/+10
* Use len for return valuesFlorian Frank2012-11-292-10/+26
|\
| * fix some bugs in the C versions of State::configure and add the alias in the ...John Shahid2012-11-232-6/+6
| * add tests to test the behavior of State::configure (and its alias State::merge).John Shahid2012-11-231-0/+16
* | add merge alias for configure in jrubyFlorian Frank2012-11-292-1/+25
|/
* Merge pull request #150 from zzak/masterFlorian Frank2012-11-121-0/+7
|\
| * BigDecimal DocumentationZachary Scott2012-11-091-0/+7
|/
* Change actual rl filessferik-max_nestingFlorian Frank2012-10-075-13/+13
* Increase default max_nesting to 100Erik Michaels-Ober2012-10-0510-29/+29
* Renamed method and handle arraysjson-generic-from_hashesFlorian Frank2012-10-022-10/+17
* Allow 1.8.6. to fail on travis, does always anywayFlorian Frank2012-10-021-0/+3
* Add JSON::GenericObject.from_hashesFlorian Frank2012-10-024-2/+21
* Prepare new versionv1.7.5Florian Frank2012-08-175-4/+6
* Avoid silly compiler warningFlorian Frank2012-08-171-1/+1
* Test on ruby-1.8.6Florian Frank2012-08-175-11/+16
* Move ruby macros into fbuffer.hFlorian Frank2012-08-174-23/+23
* Add utilsFlorian Frank2012-08-171-0/+1
* Prepare version 1.7.4v1.7.4Florian Frank2012-07-265-11/+13
* Merge branch 'master' of ssh://gate.dyna.ping.de:50022/git/jsonFlorian Frank2012-07-263-5/+5
|\
| * Use correct end of string anchorsFlorian Frank2012-07-252-4/+4
| * Fixes #142 to avoid compilation error on AIXFlorian Frank2012-07-251-1/+1
* | Add another potential JAVA_HOME directoryFlorian Frank2012-07-261-1/+8
|/
* Prepare new 1.7.3 releasev1.7.3Florian Frank2012-05-125-4/+6
* Implement work around for rbx encoding problemworkaround-rbx-encoding-issuesFlorian Frank2012-05-121-1/+4
* Prepare new version 1.7.2v1.7.2Florian Frank2012-05-115-6/+9
* Add task to create tags fileFlorian Frank2012-05-102-0/+6
* Merge branch 'jruby-fix-encoding'Florian Frank2012-05-109-47/+75
|\
| * enforce utf8 encoding in parsed stringsjruby-fix-encodingFlorian Frank2012-05-103-37/+52
| * Work around jruby's inconsistent Time implement.Florian Frank2012-05-101-1/+4
| * Fix string/regexp encoding mismatch in jrubyFlorian Frank2012-05-102-7/+13
| * force jruby encoding after generationFlorian Frank2012-05-093-2/+6
| * Prepare new versionFlorian Frank2012-05-095-4/+6
* | Prepare new versionv1.7.1Florian Frank2012-05-075-4/+6
|/
* Merge branch 'nobu-master'Florian Frank2012-05-076-6/+17
|\
| * Fix parser dependenciesnobu-masterFlorian Frank2012-05-073-7/+7
| * comment-out unused functionsNobuyoshi Nakada2012-05-072-0/+9
| * add depend filesNobuyoshi Nakada2012-05-072-0/+2
* | Stop adding 'ext' paths to LOAD_PATHluislavena-stop-polluting-load-pathLuis Lavena2012-05-062-4/+2
|/
* new version 1.7.0v1.7.0Florian Frank2012-04-284-8/+8
* Add JSON::GenericObjectFlorian Frank2012-04-285-15/+46
* Merge branch 'master' of github.com:/flori/jsonv1.6.7Florian Frank2012-04-280-0/+0
|\
| * change the CHANGESv1.6.6Florian Frank2012-03-261-1/+4
| * Use newest rubygems versionFlorian Frank2012-03-262-9/+9
| * Add a comment mentioning some limitiationFlorian Frank2012-03-261-0/+5
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2012-03-264-11/+20
| |\
| | * Merge branch 'fix-regex-stack-overflow'Florian Frank2012-03-211-21/+6
| | |\