summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v2.0' of storage.gate.ping.de:/git/json into v2.0v2.0.4v2.0Florian Frank2017-04-110-0/+0
|\
| * Fix some problems thay may lead to ruby crashingFlorian Frank2017-04-105-4/+9
| | | | | | | | | | | | | | - Raise exception for incomplete unicode surrogates/character escape sequences - Fix arbitrary heap exposure problem
* | Fix some problems thay may lead to ruby crashingFlorian Frank2017-04-115-5/+10
|/ | | | | | | - Raise exception for incomplete unicode surrogates/character escape sequences - Fix arbitrary heap exposure problem
* Raise exceptionFlorian Frank2017-04-105-23/+41
| | | | for incomplete unicode surrogates/character escape sequences
* Fix arbitrary heap exposure problemFlorian Frank2017-04-102-7/+6
|
* Remove unused macroFlorian Frank2017-04-101-3/+0
|
* Change changesv2.0.3Florian Frank2017-01-122-4/+5
|
* Release version 2.0.3Florian Frank2017-01-124-5/+5
|
* Revert "Merge decimal_class patch by Michael Jaschob"Florian Frank2017-01-1211-245/+176
| | | | This reverts commit 7e240ed5765867bfbdd166435f941a4cebed8cd8.
* 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
|\ | | | | CHANGES.md: Fixed typo
| * 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
| | | | | | Also: - Avoid some issues with bundler - Avoid some issues with jruby
* 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_create
| | * 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
| |/
| * Merge pull request #300 from kAworu/patch-1Florian Frank2016-07-291-1/+1
| |\ | | | | | | README.md typo fix
| | * README.md typo fixAlexandre Perrin2016-07-291-1/+1
| |/
* | Add change to CHANGESv2.0.2Florian Frank2016-07-261-0/+4
|/
* Merge branch 'master' of github.com:flori/jsonFlorian Frank2016-07-264-6/+7
|\
| * Merge pull request #294 from hsbt/use-assert-raiseFlorian Frank2016-07-141-3/+3
| |\ | | | | | | Fix inconsistency usage for assertion methods
| | * Fix inconsistency usage for assertion methodsSHIBATA Hiroshi2016-07-141-3/+3
| |/
| * Merge pull request #292 from nobu/patch-1Florian Frank2016-07-131-0/+1
| |\ | | | | | | Suppress a warning
| | * Suppress a warningNobuyoshi Nakada2016-07-081-0/+1
| | | | | | | | | Suppress a unused-but-set-variable warning by gcc.
| * | Merge pull request #293 from lencioni/patch-1Florian Frank2016-07-131-1/+1
| |\ \ | | |/ | |/| Fix typo "improvemed" => "improved"
| | * Fix typo "improvemed" => "improved"Joe Lencioni2016-07-121-1/+1
| |/
| * Merge pull request #290 from chottoda/fix-typo-rfc7159Florian Frank2016-07-051-2/+2
| |\ | | | | | | (README.md) Now complies to newest JSON RFC 7159.
| | * [Now complies to newest JSON RFC ↵chottoda2016-07-051-2/+2
| |/ | | | | | | 7159.](https://github.com/chottoda/json/blob/master/CHANGES.md#2015-09-11-200)
* | Fix issue #296 when parsing frozen stringsFlorian Frank2016-07-269-84/+103
| |
* | Add required_ruby_version to json_pure specFlorian Frank2016-07-193-1/+3
| |
* | Test parsing some simple singular valuesFlorian Frank2016-07-071-1/+12
|/
* Bump version to 2.0.1v2.0.1Florian Frank2016-07-014-5/+5
|
* Rename to be shorterFlorian Frank2016-07-011-0/+0
|
* Use markdown for CHANGESFlorian Frank2016-07-011-93/+154
|
* Fix problem when Parser is defined on top levelFlorian Frank2016-07-011-1/+1
| | | | See flori/json#287
* Add to CHANGESFlorian Frank2016-07-011-0/+3
|
* Stores current nesting on stackFlorian Frank2016-07-013-87/+76
|
* RB_GC_GUARD to protect from premature GCPete Johns2016-07-011-0/+1
| | | | https://github.com/ruby/ruby/blob/trunk/doc/extension.rdoc#appendix-e-rb_gc_guard-to-protect-from-premature-gc
* Add to CHANGESv2.0.0Florian Frank2016-07-013-23/+26
|
* And stay thereFlorian Frank2016-06-225-2/+3
|