summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ext/json/parser/parser.c: do not call rb_str_resize() on Time objectpick-ruby-coreeregon2018-10-252-10/+14
* Fix missed update of parser source in r62429eregon2018-10-251-0/+1
* Temporary ignored CI result of JRuby. see https://github.com/flori/json/pull/355SHIBATA Hiroshi2018-10-251-1/+1
* Merge pull request #352 from nicolasleger/patch-1SHIBATA Hiroshi2018-10-241-2/+3
|\
| * [CI] Test against Ruby 2.5Nicolas Leger2018-03-261-2/+3
* | Merge pull request #340 from lostapathy/fix_travis_widgetSHIBATA Hiroshi2018-10-231-2/+3
|\ \ | |/ |/|
| * fix link in travis widgetJoe Francis2017-10-091-2/+3
|/
* Allow failing 1.9.3 on travisFlorian Frank2017-10-041-0/+1
* JSON marshalling support for Set and SortedSetJosh Kline2017-10-042-0/+39
* Merge pull request #332 from perlun/patch-3Florian Frank2017-10-041-0/+12
|\
| * README: Added note about json/add/exceptionPer Lundberg2017-06-011-0/+12
* | Merge branch 'master' of github.com:flori/jsonFlorian Frank2017-06-211-0/+1
|\ \
| * \ Merge pull request #335 from hsbt/added-bigdecimalFlorian Frank2017-06-211-0/+1
| |\ \ | | |/ | |/|
| | * Added missing bigdecimal for its testSHIBATA Hiroshi2017-06-161-0/+1
| |/
* | Merge branch 'master' of storage.gate.ping.de:/git/jsonFlorian Frank2017-06-211-17/+21
|\ \ | |/
| * Merge pull request #330 from perlun/patch-1Florian Frank2017-05-311-17/+21
| |\
| | * Merge branch 'master' into patch-1Florian Frank2017-05-311-0/+4
| | |\ | | |/ | |/|
| * | Merge pull request #331 from perlun/patch-2Florian Frank2017-05-311-1/+1
| |\ \
| | * | Fixed json_create example to use create_additions = truePer Lundberg2017-05-311-1/+1
| |/ /
| | * README: Fixed code examples to start in the left-most columnPer Lundberg2017-05-311-17/+17
| |/
* | simplecov breaks testing => removedFlorian Frank2017-06-214-7/+1
|/
* Moving json java gemspec from here to therev2.1.0Florian Frank2017-04-182-1/+1
* Merge branch 'fix_jruby_gemspec_bug' of https://github.com/xb/jsonFlorian Frank2017-04-183-7/+3
|\
| * Back-out change of directory of json-java.gemspec.Xuân Baldauf2017-03-273-7/+3
* | Use assert_raiseFlorian Frank2017-04-181-2/+2
* | newest versionFlorian Frank2017-04-182-1/+1
* | Test the new feature and fix problemsFlorian Frank2017-04-186-34/+47
* | Merge branch 'test_bigdecimal_parsing' of https://github.com/xb/jsonFlorian Frank2017-04-181-0/+5
|\ \
| * | Actually test BigDecimal parsing.Xuân Baldauf2017-03-191-0/+5
| |/
* | New gemspecsFlorian Frank2017-04-182-2/+2
* | Raise exceptionFlorian Frank2017-04-185-23/+41
* | Fix arbitrary heap exposure problemFlorian Frank2017-04-182-7/+6
|/
* Remove unused macroFlorian Frank2017-01-221-3/+0
* Let's not get ahead of ourselvesFlorian Frank2017-01-121-1/+0
* Support some older internal Ruby API (<2.0)Florian Frank2017-01-126-1149/+1309
* Merge pull request #306 from perlun/patch-1Florian Frank2016-11-291-1/+1
|\
| * Fixed typoPer Lundberg2016-11-041-1/+1
* | Use newest rubygemsFlorian Frank2016-11-222-2/+2
* | Test newer rubiesFlorian Frank2016-11-221-3/+2
|/
* Merge decimal_class patch by Michael JaschobFlorian Frank2016-09-2315-1410/+1327
* Ignore byebug_historyFlorian Frank2016-09-231-0/+1
* Simplify JAVA_HOME codeFlorian Frank2016-09-231-7/+5
* Avoid buggy bundlerFlorian Frank2016-09-121-0/+1
* Test ruby 2.4.0-preview2Florian Frank2016-09-123-2/+3
* Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-09-091-1/+1
|\
| * Merge pull request #301 from kyanagi/fix_openstruct_json_create_docFlorian Frank2016-09-091-1/+1
| |\
| | * Correct documentation of OpenStruct.json_createKouhei Yanagita2016-08-301-1/+1
| |/
* | New gemspecFlorian Frank2016-09-092-1/+1
* | Merge remote-tracking branch 'nobu/no-Bignum'Florian Frank2016-09-092-3/+4
|\ \
| * | Get rid of use of Bignum, obsolete nameNobuyoshi Nakada2016-09-091-2/+3
| |/
View Lorry Controller Status