Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change documentation to reflect new default value | Florian Frank | 2014-04-01 | 2 | -3/+3 |
| | |||||
* | Merge pull request #194 from salimane/pr_ruby_2_1_0 | Florian Frank | 2014-01-03 | 1 | -0/+1 |
|\ | | | | | Add Ruby 2.1.0 to .travis.yml | ||||
| * | Add Ruby 2.1.0 to .travis.yml | Salimane Adjao Moustapha | 2014-01-03 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #189 from joiggama/master | Florian Frank | 2013-11-04 | 1 | -1/+1 |
|\ | | | | | Fix typo in comment | ||||
| * | Fix typo in comment | Ignacio Galindo | 2013-10-31 | 1 | -1/+1 |
|/ | |||||
* | Newest rubygemsv1.8.1 | Florian Frank | 2013-10-17 | 2 | -2/+2 |
| | |||||
* | New version 1.8.1 | Florian Frank | 2013-10-17 | 6 | -8/+13 |
| | |||||
* | Merge pull request #185 from brixen/master | Florian Frank | 2013-10-16 | 1 | -4/+1 |
|\ | | | | | Removed unnecessary and incorrect condition for Rubinius. | ||||
| * | Removed unnecessary and incorrect condition for Rubinius. | Brian Shirai | 2013-09-21 | 1 | -4/+1 |
|/ | |||||
* | Add to the CHANGESv1.8.0 | Florian Frank | 2013-05-13 | 1 | -1/+8 |
| | |||||
* | Bump to version 1.8.0add-json-generic-object-loader-dumper | Florian Frank | 2013-05-13 | 4 | -6/+6 |
| | |||||
* | forgot about 1.8 again | Florian Frank | 2013-05-13 | 1 | -1/+1 |
| | |||||
* | complete testing | Florian Frank | 2013-05-13 | 3 | -12/+17 |
| | |||||
* | resolved | Florian Frank | 2013-05-13 | 2 | -0/+19 |
| | |||||
* | Merge pull request #171 from nurse/fix-char-subscripts | Florian Frank | 2013-05-09 | 1 | -2/+2 |
|\ | | | | | Suppress warning: -Wchar-subscripts | ||||
| * | Suppress warning: -Wchar-subscripts | NARUSE, Yui | 2013-05-08 | 1 | -2/+2 |
|/ | | | | | | On some platforms char is signed char and giving signed char to isspace(int c) can cause unexpected behavior. To avoid such situation, it should cast as unsigned char. | ||||
* | Merge pull request #170 from ginriki/remove-redundancy | Florian Frank | 2013-04-29 | 1 | -1/+1 |
|\ | | | | | remove unnecessary if | ||||
| * | remove unnecessary if | ginriki | 2013-04-29 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of ssh://gate.dyna.ping.de:50022/git/json | Florian Frank | 2013-02-25 | 10 | -19/+83 |
|\ | |||||
| * | Fix regex encoding problem on ruby-head, ouch | Florian Frank | 2013-02-22 | 3 | -11/+11 |
| | | |||||
| * | Avoid funny http warning | Florian Frank | 2013-02-22 | 1 | -1/+1 |
| | | |||||
| * | Add test and implement pure versiong | Florian Frank | 2013-02-22 | 2 | -1/+30 |
| | | |||||
| * | Validate UTF-8 strings. | NARUSE, Yui | 2013-02-22 | 1 | -1/+12 |
| | | | | | | | | | | Raise JSON::GeneratorError on converting Ruby UTF-8 string to JSON as to JSON ASCII does. | ||||
| * | Try to convert first with to_hash, then to_h | Florian Frank | 2013-02-21 | 9 | -16/+40 |
| | | | | | | | | | | | | | | | | rb_convert_type doesn't return if conversion fails, so use rb_check_convert_type and the raise vi rb_convert_type. Make sure, that this behaviour is consisten across all generator implementations. Fixes https://github.com/flori/json/issues/162 | ||||
* | | test ruby 2.0.0 | Florian Frank | 2013-02-25 | 1 | -0/+1 |
|/ | |||||
* | Correct typo | Florian Frank | 2013-02-13 | 1 | -1/+1 |
| | |||||
* | Security fix create_additons/JSON::GenericObjectv1.7.7 | Florian Frank | 2013-02-11 | 17 | -63/+113 |
| | |||||
* | Merge remote-tracking branch 'github/master' | Florian Frank | 2013-02-05 | 0 | -0/+0 |
|\ | | | | | | | | | Conflicts: CHANGES | ||||
| * | Document changes | Florian Frank | 2013-02-04 | 1 | -0/+4 |
| | | |||||
| * | Add license information to gemspec task | Florian Frank | 2013-02-04 | 3 | -12/+10 |
| | | |||||
| * | Remove useless assert, fbuffer_alloc cares already | Florian Frank | 2013-02-04 | 2 | -7/+2 |
| | | |||||
| * | require test-unit for ci | Florian Frank | 2013-02-04 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #156 from jordimassaguerpla/master | Florian Frank | 2013-02-04 | 3 | -0/+3 |
| |\ | | | | | | | add license information to the gemspec | ||||
| | * | add license information to gemspecs | Jordi Massaguer Pla | 2013-02-04 | 3 | -0/+3 |
| | | | | | | | | | | | | This way we can get it when using rubygems.org api | ||||
| * | | Merge pull request #157 from zzak/master | Florian Frank | 2013-02-04 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | merge r39046 from trunk | ||||
| | * | * lib/json.rb: Move module overview definition for rdoc | Zachary Scott | 2013-02-04 | 1 | -2/+2 |
| |/ | |||||
* | | Document changes | Florian Frank | 2013-02-04 | 1 | -0/+2 |
| | | |||||
* | | fix a bug in the JRuby implementation. getInstanceVariable() can return a ↵ | John Shahid | 2013-02-04 | 2 | -1/+3 |
| | | | | | | | | null which causes NPE. | ||||
* | | Document changes | Florian Frank | 2013-02-04 | 1 | -0/+4 |
| | | |||||
* | | Add license information to gemspec task | Florian Frank | 2013-02-04 | 3 | -12/+10 |
| | | |||||
* | | * lib/json.rb: Move module overview definition for rdoc | Zachary Scott | 2013-02-04 | 1 | -2/+2 |
| | | |||||
* | | add license information to gemspecs | Jordi Massaguer Pla | 2013-02-04 | 3 | -0/+3 |
| | | | | | | | | This way we can get it when using rubygems.org api | ||||
* | | Remove useless assert, fbuffer_alloc cares already | Florian Frank | 2013-02-04 | 2 | -7/+2 |
| | | |||||
* | | require test-unit for ci | Florian Frank | 2013-01-11 | 1 | -0/+1 |
|/ | |||||
* | Prepare version 1.7.6v1.7.6 | Florian Frank | 2012-12-31 | 4 | -10/+10 |
| | |||||
* | Increase hash likeness of State objects | Florian Frank | 2012-12-31 | 14 | -51/+131 |
| | |||||
* | Merge pull request #153 from shugo/master | Florian Frank | 2012-12-13 | 1 | -1/+0 |
|\ | | | | | Remove unused variable | ||||
| * | Remove unnecessary GET_STATE(self) to avoid an unused-but-set-variable ↵ | Shugo Maeda | 2012-12-13 | 1 | -1/+0 |
|/ | | | | warning in gcc 4.6. | ||||
* | Change the CHANGES | Florian Frank | 2012-11-29 | 3 | -7/+10 |
| | |||||
* | Use len for return values | Florian Frank | 2012-11-29 | 2 | -10/+26 |
|\ |