| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #92 from nurse/U0456 | Florian Frank | 2011-10-01 | 1 | -1/+1 | |
| |\ \ | | | | | | | Fix typo: U+0456->U+0069. | |||||
| | * | | Fix typo: U+0456->U+0069. | NARUSE, Yui | 2011-09-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default. | Nobuyoshi Nakada | 2011-10-01 | 4 | -15/+3 | |
| | | | | ||||||
| * | | | Prepare new release 1.6.1v1.6.1 | Florian Frank | 2011-09-18 | 5 | -33/+35 | |
| | | | | ||||||
| * | | | Fix Rakefile to build JRuby bits using -target 1.5, for Java 1.5 and higher. | Charles Oliver Nutter | 2011-09-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Extract utils out of this library into json-utilsv1.6.0 | Florian Frank | 2011-09-13 | 22 | -3337/+97 | |
| | | | | ||||||
| * | | | Hint on encoding in comment | Florian Frank | 2011-09-12 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Split all implementations into single files | Florian Frank | 2011-09-12 | 9 | -241/+273 | |
| |/ / | | | | | | | | | This way it's easier to create one's own serialisations by picking just the desired ones and mixing them with one's own implementations. | |||||
| * | | Test ruby 1.8.6 | Florian Frank | 2011-09-03 | 1 | -0/+1 | |
| |/ | ||||||
| * | Add some documentationv1.5.4 | Florian Frank | 2011-08-31 | 10 | -35/+58 | |
| | | ||||||
| * | Move rational and complex additions in own files | Florian Frank | 2011-08-30 | 5 | -39/+48 | |
| | | | | | | | | | | Also do not require Ruby's complex.rb and rational.rb if the top level constants are already defined. This means Ruby 1.9 implementations are extendend, but Ruby 1.8 implementations will require rational/complex before they are extended. Having rational and complex additions in their own files is an especially good thing, if one wants to avoid loading complex and rational under Ruby 1.8. | |||||
| * | We don't need RB_GC_GUARD for rbx. | Florian Frank | 2011-08-30 | 1 | -0/+5 | |
| | | ||||||
| * | Apply patch by Eric Wong <nocode@yhbt.net> | Florian Frank | 2011-08-29 | 3 | -5/+26 | |
| | | | | | See https://github.com/flori/json/issues/46 | |||||
| * | Merge branch 'quirks-mode' | Florian Frank | 2011-08-29 | 21 | -436/+1223 | |
| |\ | ||||||
| | * | Merge branch 'quirks-mode-parser' into quirks-mode | Florian Frank | 2011-07-31 | 6 | -162/+486 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl json.gemspec json_pure.gemspec tests/test_json.rb | |||||
| | | * | Implement quirks_mode | Florian Frank | 2011-07-31 | 10 | -375/+1059 | |
| | | | | | | | | | | | | | This allows parsing of primitive values | |||||
| | * | | Merge branch 'quirks-mode-parser' into quirks-mode | Florian Frank | 2011-07-27 | 7 | -262/+622 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec | |||||
| | | * | | Implement quirks_mode | Florian Frank | 2011-07-27 | 7 | -266/+605 | |
| | | |/ | | | | | | | | | | This allows parsing of primitive values | |||||
| | * | | started quirks mode for generator | Florian Frank | 2011-07-27 | 16 | -104/+207 | |
| | |/ | ||||||
| * | | Merge pull request #89 from drbrain/master | Florian Frank | 2011-08-27 | 2 | -36/+36 | |
| |\ \ | | | | | | | Fix typos and grammar mistakes. Patch by Luke Gruber. [Ruby 1.9 - Bug #5203] | |||||
| | * | | Fix typos and grammar mistakes. Patch by Luke Gruber. [Ruby 1.9 - Bug 35203] | Eric Hodel | 2011-08-26 | 2 | -36/+36 | |
| |/ / | ||||||
| * | | Merge pull request #88 from michaelklishin/patch-1 | Florian Frank | 2011-08-25 | 1 | -0/+1 | |
| |\ \ | | | | | | | travis-ci.org provides 1.9.3[-preview1] | |||||
| | * | | travis-ci.org provides 1.9.3[-preview1] | Michael Klishin | 2011-08-26 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | sdoc requires rdoc from >= 1.8.7 now | Florian Frank | 2011-08-25 | 1 | -1/+0 | |
| | | | ||||||
| * | | Try to include RbConfig if it exists | Florian Frank | 2011-08-25 | 1 | -2/+7 | |
| | | | ||||||
| * | | Add (de-)serialisation methods f. Complex/Rational | Florian Frank | 2011-08-25 | 2 | -2/+45 | |
| |/ | ||||||
| * | delete after having been obsoleted | Florian Frank | 2011-07-25 | 1 | -8/+0 | |
| | | ||||||
| * | Oh, look loading the extension is much easier now | Florian Frank | 2011-07-24 | 3 | -21/+8 | |
| | | ||||||
| * | Merge branch 'master' of https://github.com/nobu/json into development | Florian Frank | 2011-07-08 | 13 | -50/+52 | |
| |\ | | | | | | | | | Conflicts: ext/json/ext/parser/parser.c | |||||
| | * | remove trailing spaces. | Nobuyoshi Nakada | 2011-07-08 | 10 | -42/+43 | |
| | | | ||||||
| | * | Duplicate the argument of convert_encoding() only. | Nobuyoshi Nakada | 2011-07-08 | 2 | -1/+2 | |
| | | | ||||||
| | * | Adjust indent. | Nobuyoshi Nakada | 2011-07-08 | 1 | -2/+2 | |
| | | | ||||||
| | * | should not modify argument | Nobuyoshi Nakada | 2011-07-08 | 2 | -1/+7 | |
| | | | | | | | | | | | * ext/json/ext/parser/parser.h (FORCE_UTF8): should not modify encoding of the argument. | |||||
| | * | no force_encoding | Nobuyoshi Nakada | 2011-07-08 | 2 | -35/+15 | |
| | | | | | | | | | | | * ext/json/ext/parser/parser.rl (JSON_parse_string): no needs to use force_encoding. | |||||
| | * | re-initialize test | Nobuyoshi Nakada | 2011-07-08 | 1 | -2/+4 | |
| | | | | | | | | | * tests/test_json.rb (test_allocate): add re-initialize test. | |||||
| | * | remove trailing spaces. | Nobuyoshi Nakada | 2011-07-08 | 1 | -0/+2 | |
| | | | | | | | | | * Rakefile (EXT_PARSER_SRC): remove trailing spaces. | |||||
| * | | Ported fixes from fix_memory_leak into Parser.rl | Florian Frank | 2011-07-08 | 2 | -85/+107 | |
| | | | | | | | | | | | Ported semantic of the desired behaviour in ruby-core:35079 to java as well. | |||||
| * | | use default rake target | Florian Frank | 2011-07-08 | 1 | -1/+1 | |
| | | | ||||||
| * | | should not modify argument | Nobuyoshi Nakada | 2011-07-08 | 2 | -1/+7 | |
| | | | | | | | | | | | * ext/json/ext/parser/parser.h (FORCE_UTF8): should not modify encoding of the argument. | |||||
| * | | no force_encoding | Nobuyoshi Nakada | 2011-07-08 | 2 | -35/+15 | |
| | | | | | | | | | | | * ext/json/ext/parser/parser.rl (JSON_parse_string): no needs to use force_encoding. | |||||
| * | | re-initialize test | Nobuyoshi Nakada | 2011-07-08 | 1 | -2/+4 | |
| | | | | | | | | | * tests/test_json.rb (test_allocate): add re-initialize test. | |||||
| * | | remove trailing spaces. | Nobuyoshi Nakada | 2011-07-08 | 1 | -0/+2 | |
| |/ | | | | * Rakefile (EXT_PARSER_SRC): remove trailing spaces. | |||||
| * | * remove trailing spaces. | nobu | 2011-07-07 | 3 | -114/+114 | |
| | | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * lib/json/common.rb (JSON::MissingUnicodeSupport.iconv): should not drop ↵ | nobu | 2011-07-07 | 1 | -1/+1 | |
| | | | | | | | rest of the result. use Iconv.conv instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * ext/json/ext/parser/parser.h (GET_PARSER): raise TypeError. | nobu | 2011-07-07 | 4 | -3/+10 | |
| | | | | | | | * ext/json/ext/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * ext/json/ext/parser/parser.h (GET_PARSER): check if initialized. ↵ | nobu | 2011-07-07 | 3 | -7/+20 | |
| | | | | | | | | | [ruby-core:35079] * ext/json/ext/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * ext/json/ext/parser/parser.rl: add local variables for emacs. | nobu | 2011-07-07 | 2 | -18/+32 | |
| | | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * ext/json/ext/generator/generator.{c,h} (fbuffer_free_only_buffer): unused. | nobu | 2011-07-07 | 1 | -1/+0 | |
| | | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | * ext/json/generator/ext/generator.c (fbuffer_free): unused. | nobu | 2011-07-07 | 1 | -5/+0 | |
| | | | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e | |||||
| * | Appy patch by Laurent Arnoud <laurent@spkdev.net> | Florian Frank | 2011-07-04 | 3 | -40/+14 | |
| | | | | | Use Spruz::GO.go for options parsing | |||||
 |
index : delta/ruby-gems/json.git | |
| github.com: flori/json |
| summaryrefslogtreecommitdiff |