summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Security fix create_additons/JSON::GenericObjectv1.7.7Florian Frank2013-02-1117-63/+113
* Merge remote-tracking branch 'github/master'Florian Frank2013-02-050-0/+0
|\
| * Document changesFlorian Frank2013-02-041-0/+4
| * Add license information to gemspec taskFlorian Frank2013-02-043-12/+10
| * Remove useless assert, fbuffer_alloc cares alreadyFlorian Frank2013-02-042-7/+2
| * require test-unit for ciFlorian Frank2013-02-041-0/+1
| * Merge pull request #156 from jordimassaguerpla/masterFlorian Frank2013-02-043-0/+3
| |\
| | * add license information to gemspecsJordi Massaguer Pla2013-02-043-0/+3
| * | Merge pull request #157 from zzak/masterFlorian Frank2013-02-041-2/+2
| |\ \ | | |/ | |/|
| | * * lib/json.rb: Move module overview definition for rdocZachary Scott2013-02-041-2/+2
| |/
* | Document changesFlorian Frank2013-02-041-0/+2
* | fix a bug in the JRuby implementation. getInstanceVariable() can return a nul...John Shahid2013-02-042-1/+3
* | Document changesFlorian Frank2013-02-041-0/+4
* | Add license information to gemspec taskFlorian Frank2013-02-043-12/+10
* | * lib/json.rb: Move module overview definition for rdocZachary Scott2013-02-041-2/+2
* | add license information to gemspecsJordi Massaguer Pla2013-02-043-0/+3
* | Remove useless assert, fbuffer_alloc cares alreadyFlorian Frank2013-02-042-7/+2
* | require test-unit for ciFlorian Frank2013-01-111-0/+1
|/
* 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