summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #194 from salimane/pr_ruby_2_1_0Florian Frank2014-01-031-0/+1
| |\
| | * Add Ruby 2.1.0 to .travis.ymlSalimane Adjao Moustapha2014-01-031-0/+1
| |/
| * Merge pull request #189 from joiggama/masterFlorian Frank2013-11-041-1/+1
| |\
| | * Fix typo in commentIgnacio Galindo2013-10-311-1/+1
| |/
* | - Pass over generator.c for grammar fixes.Vipul A M2014-07-033-5/+4
* | Fix documentation wordingFlorian Frank2014-07-035-15/+15
* | Test on Ruby 2.1.x as wellFlorian Frank2014-07-031-0/+1
|/
* Newest rubygemsv1.8.1Florian Frank2013-10-172-2/+2
* New version 1.8.1Florian Frank2013-10-176-8/+13
* Merge pull request #185 from brixen/masterFlorian Frank2013-10-161-4/+1
|\
| * 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
|/