summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json i...Florian Frank2011-07-041-9/+12
|\
| * bin/prettify_json.rb: Set max_nesting and create_additions to false like edit...Laurent Arnoud2010-10-091-9/+12
* | Add rake as development dependencyFlorian Frank2011-07-043-2/+6
* | Bump up version to 1.5.4Florian Frank2011-07-048-13/+30
* | Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into develop...Florian Frank2011-07-049-46/+51
|\ \
| * | Fix memory leak when used from multiple JRuby runtimes.John Firebaugh2011-05-189-46/+51
* | | Make default rake target testFlorian Frank2011-07-041-1/+2
* | | new orderv1.5.3Florian Frank2011-06-202-2/+2
* | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-06-2012-48/+145
|\ \ \
| * | | Include travis-ci iconFlorian Frank2011-06-202-6/+2
| * | | clobber RakefileFlorian Frank2011-06-201-1/+1
| * | | fixed .travis.ymlFlorian Frank2011-06-201-4/+1
| * | | configure rake as gemFlorian Frank2011-06-201-0/+1
| * | | Add Gemfile for testsFlorian Frank2011-06-201-0/+8
| * | | also test everythingFlorian Frank2011-06-201-0/+2
| * | | add travis.ymlFlorian Frank2011-06-201-0/+22
| * | | prepare new releaseFlorian Frank2011-06-203-3/+5
| * | | Alias State#configure method as State#mergeFlorian Frank2011-06-203-0/+4
| * | | Define as_json methods, so rails can make objectsFlorian Frank2011-06-201-41/+106
| * | | Bump version to 1.5.3Florian Frank2011-06-174-23/+23
* | | | new gemspecsFlorian Frank2011-06-202-2/+2
|/ / /
* | | gemspec needs to return spec for gem build to workFlorian Frank2011-06-151-1/+3
* | | Use new PackageTask from rubygemsv1.5.2Florian Frank2011-06-151-4/+4
* | | changed the CHANGESFlorian Frank2011-06-153-20/+23
* | | clean up superflous tabsFlorian Frank2011-06-155-30/+30
* | | renamed README -> README.rdocFlorian Frank2011-06-103-21/+19
* | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-06-099-77/+103
|\ \ \
| * | | Skip test which fails on some platformsFlorian Frank2011-05-121-1/+1
| * | | Fix duplicate testFlorian Frank2011-05-121-39/+19
| * | | Don't optimize calls for ducktypesFlorian Frank2011-05-125-57/+106
| * | | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-05-122-17/+25
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/github/master'Florian Frank2011-05-112-5/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #59 from lorensr/masterFlorian Frank2011-05-112-1/+1
| | |\ \ \
| | | * | | typo, README file extensionlorensr2011-02-062-1/+1
| | * | | | Merge pull request #63 from vakuum/issue-60Florian Frank2011-05-112-5/+2
| | |\ \ \ \
| | | * | | | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-1/+1
| | | * | | | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-262-5/+2
| | | |/ / /
| * | | | | typo, README file extensionlorensr2011-05-112-1/+1
* | | | | | Create gemspec by defaultFlorian Frank2011-06-093-19/+21
* | | | | | Apply patch by Cory Monty <cory.monty@gmail.com>.Florian Frank2011-06-094-5/+93
| |_|_|/ / |/| | | |
* | | | | use []= method if objectClass isn't a HashFlorian Frank2011-05-112-17/+25
|/ / / /
* | | | Merge branch 'gmaster'Florian Frank2011-05-110-0/+0
|\ \ \ \
| * | | | Revert "Put the json and json_pure gemspecs in standalone .gemspec files so t...Florian Frank2011-05-114-89/+80
| * | | | Revert "Add the constants.rb file to the gemspec ignore list, and don't echo ...Florian Frank2011-05-111-3/+3
| |/ / /
| * | | Merge pull request #72 from nono/rubygems_deprecationsFlorian Frank2011-05-112-4/+0
| |\ \ \
| | * | | has_rdoc= and default_executable= have been deprecatedBruno Michel2011-05-082-4/+0
| |/ / /
| * | | Merged pull request #69 from jonleighton/master.Florian Frank2011-04-267-152/+183
| |\ \ \ | | |/ / | |/| |
| | * | Add the constants.rb file to the gemspec ignore list, and don't echo the stdo...Jon Leighton2011-04-011-3/+3
| | * | Put the json and json_pure gemspecs in standalone .gemspec files so that they...Jon Leighton2011-04-014-80/+93
| | * | If a custom :object_class is given, the C extension should not use rb_hash_as...Jon Leighton2011-04-013-72/+90
| |/ /