| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json ↵ | Florian Frank | 2011-07-04 | 1 | -9/+12 | |
| |\ | | | | | | | into development | |||||
| | * | bin/prettify_json.rb: Set max_nesting and create_additions to false like ↵ | Laurent Arnoud | 2010-10-09 | 1 | -9/+12 | |
| | | | | | | | | | | | | | | | | | edit_json it refers to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561839 Signed-off-by: Laurent Arnoud <laurent@spkdev.net> | |||||
| * | | Add rake as development dependency | Florian Frank | 2011-07-04 | 3 | -2/+6 | |
| | | | ||||||
| * | | Bump up version to 1.5.4 | Florian Frank | 2011-07-04 | 8 | -13/+30 | |
| | | | ||||||
| * | | Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into ↵ | Florian Frank | 2011-07-04 | 9 | -46/+51 | |
| |\ \ | | | | | | | | | | development | |||||
| | * | | Fix memory leak when used from multiple JRuby runtimes. | John Firebaugh | 2011-05-18 | 9 | -46/+51 | |
| | | | | ||||||
| * | | | Make default rake target test | Florian Frank | 2011-07-04 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | new orderv1.5.3 | Florian Frank | 2011-06-20 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-06-20 | 12 | -48/+145 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec | |||||
| | * | | | Include travis-ci icon | Florian Frank | 2011-06-20 | 2 | -6/+2 | |
| | | | | | ||||||
| | * | | | clobber Rakefile | Florian Frank | 2011-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | fixed .travis.yml | Florian Frank | 2011-06-20 | 1 | -4/+1 | |
| | | | | | ||||||
| | * | | | configure rake as gem | Florian Frank | 2011-06-20 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Add Gemfile for tests | Florian Frank | 2011-06-20 | 1 | -0/+8 | |
| | | | | | ||||||
| | * | | | also test everything | Florian Frank | 2011-06-20 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | add travis.yml | Florian Frank | 2011-06-20 | 1 | -0/+22 | |
| | | | | | ||||||
| | * | | | prepare new release | Florian Frank | 2011-06-20 | 3 | -3/+5 | |
| | | | | | ||||||
| | * | | | Alias State#configure method as State#merge | Florian Frank | 2011-06-20 | 3 | -0/+4 | |
| | | | | | | | | | | | | | | | | | This increases duck type synonymy with Hash | |||||
| | * | | | Define as_json methods, so rails can make objects | Florian Frank | 2011-06-20 | 1 | -41/+106 | |
| | | | | | ||||||
| | * | | | Bump version to 1.5.3 | Florian Frank | 2011-06-17 | 4 | -23/+23 | |
| | | | | | ||||||
| * | | | | new gemspecs | Florian Frank | 2011-06-20 | 2 | -2/+2 | |
| |/ / / | ||||||
| * | | | gemspec needs to return spec for gem build to work | Florian Frank | 2011-06-15 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Use new PackageTask from rubygemsv1.5.2 | Florian Frank | 2011-06-15 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | changed the CHANGES | Florian Frank | 2011-06-15 | 3 | -20/+23 | |
| | | | | ||||||
| * | | | clean up superflous tabs | Florian Frank | 2011-06-15 | 5 | -30/+30 | |
| | | | | ||||||
| * | | | renamed README -> README.rdoc | Florian Frank | 2011-06-10 | 3 | -21/+19 | |
| | | | | ||||||
| * | | | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-06-09 | 9 | -77/+103 | |
| |\ \ \ | ||||||
| | * | | | Skip test which fails on some platforms | Florian Frank | 2011-05-12 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix duplicate test | Florian Frank | 2011-05-12 | 1 | -39/+19 | |
| | | | | | ||||||
| | * | | | Don't optimize calls for ducktypes | Florian Frank | 2011-05-12 | 5 | -57/+106 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-05-12 | 2 | -17/+25 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge remote-tracking branch 'remotes/github/master' | Florian Frank | 2011-05-11 | 2 | -5/+2 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | | Merge pull request #59 from lorensr/master | Florian Frank | 2011-05-11 | 2 | -1/+1 | |
| | | |\ \ \ | | | | | | | | | | | | | fixed typo, changed README file extension | |||||
| | | | * | | | typo, README file extension | lorensr | 2011-02-06 | 2 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Merge pull request #63 from vakuum/issue-60 | Florian Frank | 2011-05-11 | 2 | -5/+2 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | flori/json#60: Incorrect pretty-print indentation | |||||
| | | | * | | | | flori/json#60: Incorrect pretty-print indentation | Clemens Fuchslocher | 2011-02-26 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | flori/json#60: Incorrect pretty-print indentation | Clemens Fuchslocher | 2011-02-26 | 2 | -5/+2 | |
| | | | |/ / / | ||||||
| | * | | | | | typo, README file extension | lorensr | 2011-05-11 | 2 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Create gemspec by default | Florian Frank | 2011-06-09 | 3 | -19/+21 | |
| | | | | | | | ||||||
| * | | | | | | Apply patch by Cory Monty <cory.monty@gmail.com>. | Florian Frank | 2011-06-09 | 4 | -5/+93 | |
| | |_|_|/ / |/| | | | | ||||||
| * | | | | | use []= method if objectClass isn't a Hash | Florian Frank | 2011-05-11 | 2 | -17/+25 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'gmaster' | Florian Frank | 2011-05-11 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| | * | | | | Revert "Put the json and json_pure gemspecs in standalone .gemspec files so ↵ | Florian Frank | 2011-05-11 | 4 | -89/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that they can be used by Bundler" This reverts commit dbd6343217ab77c37948d1202541ae33076155ab. Conflicts: json.gemspec json_pure.gemspec | |||||
| | * | | | | Revert "Add the constants.rb file to the gemspec ignore list, and don't echo ↵ | Florian Frank | 2011-05-11 | 1 | -3/+3 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | the stdout when detecting the ragel binaries" This reverts commit a592f7ef0af4cf54fa5dad536cc0203d4084c781. | |||||
| | * | | | Merge pull request #72 from nono/rubygems_deprecations | Florian Frank | 2011-05-11 | 2 | -4/+0 | |
| | |\ \ \ | | | | | | | | | | | has_rdoc= and default_executable= have been deprecated | |||||
| | | * | | | has_rdoc= and default_executable= have been deprecated | Bruno Michel | 2011-05-08 | 2 | -4/+0 | |
| | |/ / / | ||||||
| | * | | | Merged pull request #69 from jonleighton/master. | Florian Frank | 2011-04-26 | 7 | -152/+183 | |
| | |\ \ \ | | |/ / | |/| | | If a custom :object_class is given, the C extension should not use rb_hash_aset - it should call the object's []= method instead. | |||||
| | | * | | Add the constants.rb file to the gemspec ignore list, and don't echo the ↵ | Jon Leighton | 2011-04-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | stdout when detecting the ragel binaries | |||||
| | | * | | Put the json and json_pure gemspecs in standalone .gemspec files so that ↵ | Jon Leighton | 2011-04-01 | 4 | -80/+93 | |
| | | | | | | | | | | | | | | | | | they can be used by Bundler | |||||
| | | * | | If a custom :object_class is given, the C extension should not use ↵ | Jon Leighton | 2011-04-01 | 3 | -72/+90 | |
| | |/ / | | | | | | | | | | rb_hash_aset - it should call the object's []= method instead. | |||||
 |
index : delta/ruby-gems/json.git | |
| github.com: flori/json |
| summaryrefslogtreecommitdiff |