summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement quirks_modeFlorian Frank2011-07-277-266/+605
* delete after having been obsoletedFlorian Frank2011-07-251-8/+0
* Oh, look loading the extension is much easier nowFlorian Frank2011-07-243-21/+8
* Merge branch 'master' of https://github.com/nobu/json into developmentFlorian Frank2011-07-0813-50/+52
|\
| * remove trailing spaces.Nobuyoshi Nakada2011-07-0810-42/+43
| * Duplicate the argument of convert_encoding() only.Nobuyoshi Nakada2011-07-082-1/+2
| * Adjust indent.Nobuyoshi Nakada2011-07-081-2/+2
| * should not modify argumentNobuyoshi Nakada2011-07-082-1/+7
| * no force_encodingNobuyoshi Nakada2011-07-082-35/+15
| * re-initialize testNobuyoshi Nakada2011-07-081-2/+4
| * remove trailing spaces.Nobuyoshi Nakada2011-07-081-0/+2
* | Ported fixes from fix_memory_leak into Parser.rlFlorian Frank2011-07-082-85/+107
* | use default rake targetFlorian Frank2011-07-081-1/+1
* | should not modify argumentNobuyoshi Nakada2011-07-082-1/+7
* | no force_encodingNobuyoshi Nakada2011-07-082-35/+15
* | re-initialize testNobuyoshi Nakada2011-07-081-2/+4
* | remove trailing spaces.Nobuyoshi Nakada2011-07-081-0/+2
|/
* * remove trailing spaces.nobu2011-07-073-114/+114
* * lib/json/common.rb (JSON::MissingUnicodeSupport.iconv): should not drop res...nobu2011-07-071-1/+1
* * ext/json/ext/parser/parser.h (GET_PARSER): raise TypeError.nobu2011-07-074-3/+10
* * ext/json/ext/parser/parser.h (GET_PARSER): check if initialized. [ruby-core...nobu2011-07-073-7/+20
* * ext/json/ext/parser/parser.rl: add local variables for emacs.nobu2011-07-072-18/+32
* * ext/json/ext/generator/generator.{c,h} (fbuffer_free_only_buffer): unused.nobu2011-07-071-1/+0
* * ext/json/generator/ext/generator.c (fbuffer_free): unused.nobu2011-07-071-5/+0
* Appy patch by Laurent Arnoud <laurent@spkdev.net>Florian Frank2011-07-043-40/+14
* 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