Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ext/json/parser/parser.c: do not call rb_str_resize() on Time objectpick-ruby-core | eregon | 2018-10-25 | 2 | -10/+14 |
| | | | | | | * See https://github.com/flori/json/issues/342 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||||
* | Fix missed update of parser source in r62429 | eregon | 2018-10-25 | 1 | -0/+1 |
| | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | ||||
* | Temporary ignored CI result of JRuby. see https://github.com/flori/json/pull/355 | SHIBATA Hiroshi | 2018-10-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #352 from nicolasleger/patch-1 | SHIBATA Hiroshi | 2018-10-24 | 1 | -2/+3 |
|\ | | | | | [CI] Test against Ruby 2.5 | ||||
| * | [CI] Test against Ruby 2.5 | Nicolas Leger | 2018-03-26 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #340 from lostapathy/fix_travis_widget | SHIBATA Hiroshi | 2018-10-23 | 1 | -2/+3 |
|\ \ | |/ |/| | fix link in travis widget | ||||
| * | fix link in travis widget | Joe Francis | 2017-10-09 | 1 | -2/+3 |
|/ | |||||
* | Allow failing 1.9.3 on travis | Florian Frank | 2017-10-04 | 1 | -0/+1 |
| | |||||
* | JSON marshalling support for Set and SortedSet | Josh Kline | 2017-10-04 | 2 | -0/+39 |
| | |||||
* | Merge pull request #332 from perlun/patch-3 | Florian Frank | 2017-10-04 | 1 | -0/+12 |
|\ | | | | | README: Added note about json/add/exception | ||||
| * | README: Added note about json/add/exception | Per Lundberg | 2017-06-01 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'master' of github.com:flori/json | Florian Frank | 2017-06-21 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge pull request #335 from hsbt/added-bigdecimal | Florian Frank | 2017-06-21 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | Added missing bigdecimal for its test | ||||
| | * | Added missing bigdecimal for its test | SHIBATA Hiroshi | 2017-06-16 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'master' of storage.gate.ping.de:/git/json | Florian Frank | 2017-06-21 | 1 | -17/+21 |
|\ \ | |/ | |||||
| * | Merge pull request #330 from perlun/patch-1 | Florian Frank | 2017-05-31 | 1 | -17/+21 |
| |\ | | | | | | | README: Fixed code examples to start in the left-most column | ||||
| | * | Merge branch 'master' into patch-1 | Florian Frank | 2017-05-31 | 1 | -0/+4 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #331 from perlun/patch-2 | Florian Frank | 2017-05-31 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fixed json_create example to use create_additions = true | ||||
| | * | | Fixed json_create example to use create_additions = true | Per Lundberg | 2017-05-31 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | The example doesn't work OOTB, since this flag is _not enabled_ by default. (Even with this change in place, I cannot get additions to work with the `Range` class. For custom objects it works though, I tested with the example from the `json_addition_test.rb` - that's where I got the working approach.) | ||||
| | * | README: Fixed code examples to start in the left-most column | Per Lundberg | 2017-05-31 | 1 | -17/+17 |
| |/ | | | | | I feel that it's more natural this way. What do you think, do you prefer the current style? | ||||
* | | simplecov breaks testing => removed | Florian Frank | 2017-06-21 | 4 | -7/+1 |
|/ | |||||
* | Moving json java gemspec from here to therev2.1.0 | Florian Frank | 2017-04-18 | 2 | -1/+1 |
| | |||||
* | Merge branch 'fix_jruby_gemspec_bug' of https://github.com/xb/json | Florian Frank | 2017-04-18 | 3 | -7/+3 |
|\ | |||||
| * | Back-out change of directory of json-java.gemspec. | Xuân Baldauf | 2017-03-27 | 3 | -7/+3 |
| | | |||||
* | | Use assert_raise | Florian Frank | 2017-04-18 | 1 | -2/+2 |
| | | |||||
* | | newest version | Florian Frank | 2017-04-18 | 2 | -1/+1 |
| | | |||||
* | | Test the new feature and fix problems | Florian Frank | 2017-04-18 | 6 | -34/+47 |
| | | | | | | | | | | | | - Initialize i_new - Add to changes - Test on ruby 2.4.1 | ||||
* | | Merge branch 'test_bigdecimal_parsing' of https://github.com/xb/json | Florian Frank | 2017-04-18 | 1 | -0/+5 |
|\ \ | |||||
| * | | Actually test BigDecimal parsing. | Xuân Baldauf | 2017-03-19 | 1 | -0/+5 |
| |/ | |||||
* | | New gemspecs | Florian Frank | 2017-04-18 | 2 | -2/+2 |
| | | |||||
* | | Raise exception | Florian Frank | 2017-04-18 | 5 | -23/+41 |
| | | | | | | | | for incomplete unicode surrogates/character escape sequences | ||||
* | | Fix arbitrary heap exposure problem | Florian Frank | 2017-04-18 | 2 | -7/+6 |
|/ | |||||
* | Remove unused macro | Florian Frank | 2017-01-22 | 1 | -3/+0 |
| | |||||
* | Let's not get ahead of ourselves | Florian Frank | 2017-01-12 | 1 | -1/+0 |
| | |||||
* | Support some older internal Ruby API (<2.0) | Florian Frank | 2017-01-12 | 6 | -1149/+1309 |
| | |||||
* | Merge pull request #306 from perlun/patch-1 | Florian Frank | 2016-11-29 | 1 | -1/+1 |
|\ | | | | | CHANGES.md: Fixed typo | ||||
| * | Fixed typo | Per Lundberg | 2016-11-04 | 1 | -1/+1 |
| | | |||||
* | | Use newest rubygems | Florian Frank | 2016-11-22 | 2 | -2/+2 |
| | | |||||
* | | Test newer rubies | Florian Frank | 2016-11-22 | 1 | -3/+2 |
|/ | |||||
* | Merge decimal_class patch by Michael Jaschob | Florian Frank | 2016-09-23 | 15 | -1410/+1327 |
| | | | | | | Also: - Avoid some issues with bundler - Avoid some issues with jruby | ||||
* | Ignore byebug_history | Florian Frank | 2016-09-23 | 1 | -0/+1 |
| | |||||
* | Simplify JAVA_HOME code | Florian Frank | 2016-09-23 | 1 | -7/+5 |
| | |||||
* | Avoid buggy bundler | Florian Frank | 2016-09-12 | 1 | -0/+1 |
| | |||||
* | Test ruby 2.4.0-preview2 | Florian Frank | 2016-09-12 | 3 | -2/+3 |
| | |||||
* | Merge branch 'master' of github.com:flori/json | Florian Frank | 2016-09-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #301 from kyanagi/fix_openstruct_json_create_doc | Florian Frank | 2016-09-09 | 1 | -1/+1 |
| |\ | | | | | | | Correct documentation of OpenStruct.json_create | ||||
| | * | Correct documentation of OpenStruct.json_create | Kouhei Yanagita | 2016-08-30 | 1 | -1/+1 |
| |/ | |||||
* | | New gemspec | Florian Frank | 2016-09-09 | 2 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'nobu/no-Bignum' | Florian Frank | 2016-09-09 | 2 | -3/+4 |
|\ \ | |||||
| * | | Get rid of use of Bignum, obsolete name | Nobuyoshi Nakada | 2016-09-09 | 1 | -2/+3 |
| |/ |