summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/MagLev/json into MagLev-masterMagLev-masterFlorian Frank2011-12-2128-365/+613
|\
| * Merge remote-tracking branch 'json/master'Tim Felgentreff2011-12-0927-350/+569
| |\ | | | | | | | | | | | | | | | Conflicts: ext/json/ext/parser/parser.c ext/json/ext/parser/parser.rl
| | * This makes all the difference, I am sure.v1.6.3Florian Frank2011-12-012-5/+5
| | |
| | * Small fix: JSON.load('') # => nilFlorian Frank2011-12-017-7/+12
| | |
| | * Create new gemspecsv1.6.2Florian Frank2011-11-282-4/+4
| | |
| | * Move fbuffer in its own directoryFlorian Frank2011-11-284-3/+3
| | |
| | * Add change to CHANGESFlorian Frank2011-11-281-0/+3
| | |
| | * Merge branch 'extract-fbuffer'Florian Frank2011-11-2313-305/+408
| | |\
| | | * support buffer length settingsFlorian Frank2011-11-231-0/+21
| | | |
| | | * avoid symlinkFlorian Frank2011-11-235-4/+3
| | | |
| | | * Extract fbuffer and use it in parser and generatorFlorian Frank2011-11-239-253/+271
| | | |
| | | * change documentationFlorian Frank2011-11-102-3/+5
| | | |
| | | * Merge branch 'configurable-initial-buffer-length' of ↵Florian Frank2011-11-101-0/+20
| | | |\ | | | | | | | | | | | | | | | gate.dyna.ping.de:/git/json into configurable-initial-buffer-length
| | | | * start to make buffer_initial_length configurableFlorian Frank2011-11-091-0/+2
| | | | |
| | | | * start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+126
| | | | |
| | | * | start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+128
| | | | |
| | * | | Use git ls-files to determine package filesFlorian Frank2011-11-233-6/+5
| | | | |
| | * | | Change the CHANGESFlorian Frank2011-11-221-0/+2
| | | | |
| | * | | Merge branch 'master' of https://github.com/jpartlow/json into jpartlow-masterFlorian Frank2011-11-222-3/+3
| | |\ \ \
| | | * | | Fix for Time.json_create ensures == Time instances for roundtrip through ↵Josh Partlow2011-11-182-3/+3
| | | | |/ | | | |/| | | | | | | | | | | JSON serialization in Ruby 1.9.2.
| | * | | Make JSON.dump and JSON.load support Rails betterFlorian Frank2011-11-224-5/+56
| | | | |
| | * | | Prepare new version 1.6.2Florian Frank2011-11-225-6/+9
| | | | |
| | * | | Add support for OpenStructFlorian Frank2011-11-217-29/+84
| | |/ /
| * | | MEMZERO effectively sets everything to Qfalse, not QnilTim Felgentreff2011-11-162-12/+12
| | | |
| * | | Merge remote-tracking branch 'json/master'Tim Felgentreff2011-11-166-20/+49
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: ext/json/ext/parser/parser.c
| | * | Add testcase for a possible crash with bignumFlorian Frank2011-11-091-0/+20
| | |/
| | * probe for read before calling itFlorian Frank2011-11-031-1/+1
| | |
| | * always raise type error when parsing nilFlorian Frank2011-11-034-19/+28
| | |
| * | Merge remote-tracking branch 'json/master'Tim Felgentreff2011-10-028-19/+31
| |\ \ | | |/
* | | Merge branch 'master' of https://github.com/MagLev/json into MagLev-masterFlorian Frank2011-10-024-43/+78
|\ \ \ | |/ / | | / | |/ |/|
| * change source so that it'll work on all implsTim Felgentreff2011-09-273-125/+131
| |
| * Merge remote-tracking branch 'json/master'Tim Felgentreff2011-09-2756-4005/+1673
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ext/json/ext/parser/parser.c ext/json/ext/parser/parser.rl json.gemspec
| * | remove reimplementation of rb_obj_is_kind_of and add some RTESTAllen Otis2011-09-011-9/+2
| | |
| * | json.gemspec is referencing build product mkmf.logTim Felgentreff2011-08-091-1/+1
| | |
| * | try to keep the diff to flori/json smallTim Felgentreff2011-08-091-1/+0
| | |
| * | Merge branch 'master' of https://github.com/MagLev/jsonTim Felgentreff2011-08-090-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec
| | * | proper gemspecs, so we can use them in bundlerTim Felgentreff2011-08-093-0/+75
| | | | | | | | | | | | | | | | Signed-off-by: Allen Otis <otisa@vmware.com>
| * | | Throwing this error on Maglev is inappropriateTim Felgentreff2011-08-092-0/+4
| | | |
| * | | Merge remote-tracking branch 'json/master'Tim Felgentreff2011-08-0937-624/+909
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/json/ext/parser/parser.c ext/json/ext/parser/parser.rl json.gemspec json_pure.gemspec
| * | | | proper gemspecs, so we can use them in bundlerTim Felgentreff2011-08-093-0/+75
| | |/ / | |/| |
| * | | Changes to work with Maglev implementation of Ruby C extensions.Allen Otis2011-03-084-105/+135
| | | |
* | | | Add support for BigDecimal numbersFlorian Frank2011-10-023-3/+27
| | | |
* | | | Merge pull request #91 from nobu/masterFlorian Frank2011-10-010-0/+0
|\ \ \ \ | | | | | | | | | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.
| * | | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.Nobuyoshi Nakada2011-09-034-15/+3
| | | | |
* | | | | Merge pull request #92 from nurse/U0456Florian Frank2011-10-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo: U+0456->U+0069.
| * | | | | Fix typo: U+0456->U+0069.NARUSE, Yui2011-09-051-1/+1
| | | | | |
* | | | | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.Nobuyoshi Nakada2011-10-014-15/+3
| |_|_|_|/ |/| | | |
* | | | | Prepare new release 1.6.1v1.6.1Florian Frank2011-09-185-33/+35
| | | | |
* | | | | Fix Rakefile to build JRuby bits using -target 1.5, for Java 1.5 and higher.Charles Oliver Nutter2011-09-141-1/+1
| | | | |
* | | | | Extract utils out of this library into json-utilsv1.6.0Florian Frank2011-09-1322-3337/+97
| | | | |
View Lorry Controller Status