summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* New specbrixen-masterFlorian Frank2013-10-012-4/+6
* Removed unnecessary and incorrect condition for Rubinius.Brian Shirai2013-09-211-4/+1
* Add to the CHANGESv1.8.0Florian Frank2013-05-131-1/+8
* Bump to version 1.8.0add-json-generic-object-loader-dumperFlorian Frank2013-05-134-6/+6
* forgot about 1.8 againFlorian Frank2013-05-131-1/+1
* complete testingFlorian Frank2013-05-133-12/+17
* resolvedFlorian Frank2013-05-132-0/+19
* Merge pull request #171 from nurse/fix-char-subscriptsFlorian Frank2013-05-091-2/+2
|\
| * Suppress warning: -Wchar-subscriptsNARUSE, Yui2013-05-081-2/+2
|/
* Merge pull request #170 from ginriki/remove-redundancyFlorian Frank2013-04-291-1/+1
|\
| * remove unnecessary ifginriki2013-04-291-1/+1
|/
* Merge branch 'master' of ssh://gate.dyna.ping.de:50022/git/jsonFlorian Frank2013-02-2510-19/+83
|\
| * Fix regex encoding problem on ruby-head, ouchFlorian Frank2013-02-223-11/+11
| * Avoid funny http warningFlorian Frank2013-02-221-1/+1
| * Add test and implement pure versiongFlorian Frank2013-02-222-1/+30
| * Validate UTF-8 strings.NARUSE, Yui2013-02-221-1/+12
| * Try to convert first with to_hash, then to_hFlorian Frank2013-02-219-16/+40
* | test ruby 2.0.0Florian Frank2013-02-251-0/+1
|/
* Correct typoFlorian Frank2013-02-131-1/+1
* 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
View Lorry Controller Status