summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | 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 ↵Florian Frank2011-05-114-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 Frank2011-05-111-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | the stdout when detecting the ragel binaries" This reverts commit a592f7ef0af4cf54fa5dad536cc0203d4084c781.
| * | | Merge pull request #72 from nono/rubygems_deprecationsFlorian Frank2011-05-112-4/+0
| |\ \ \ | | | | | | | | | | has_rdoc= and default_executable= have been deprecated
| | * | | 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
| |\ \ \ | | |/ / | |/| | 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 Leighton2011-04-011-3/+3
| | | | | | | | | | | | | | | | stdout when detecting the ragel binaries
| | * | Put the json and json_pure gemspecs in standalone .gemspec files so that ↵Jon Leighton2011-04-014-80/+93
| | | | | | | | | | | | | | | | they can be used by Bundler
| | * | If a custom :object_class is given, the C extension should not use ↵Jon Leighton2011-04-013-72/+90
| |/ / | | | | | | | | | rb_hash_aset - it should call the object's []= method instead.
* | | If a custom :object_class is given, the C extension should not use ↵Jon Leighton2011-05-113-72/+90
| | | | | | | | | | | | rb_hash_aset - it should call the object's []= method instead.
* | | Adds development dependenciesFlorian Frank2011-05-113-20/+44
| | |
* | | Create gemspecsFlorian Frank2011-05-116-39/+84
|/ / | | | | | | Get rid of rake-compiler dependencies
* | Support building of fat binary gemv1.5.1Florian Frank2011-01-265-6/+26
| | | | | | | | This should fix issue #51 on Windows
* | renamed :match argument to :match_stringv1.5.0Florian Frank2011-01-057-35/+37
| |
* | avoid object creationFlorian Frank2011-01-032-42/+38
| |
* | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-01-030-0/+0
|\ \ | |/ | | | | | | Conflicts: Rakefile
| * Merge branch 'integrate-jruby'Florian Frank2010-10-056-983/+8
| |\ | | | | | | | | | | | | Conflicts: Rakefile
| | * started to build jruby extension with RakefileFlorian Frank2010-09-2729-1177/+272
| | |
* | | Merge branch 'string-matching'Florian Frank2011-01-0218-321/+505
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore Rakefile tests/test_json_encoding.rb
| * | | Rubinius' strscan already has a @match ivarFlorian Frank2011-01-024-5/+7
| | | |
| * | | query if ruby/st.h existsFlorian Frank2011-01-022-0/+5
| | | |
| * | | fixed test setupFlorian Frank2011-01-029-52/+33
| | | |
| * | | implement string matching for java parserFlorian Frank2011-01-026-300/+348
| | | |
| * | | Added matching in pure/ext parserFlorian Frank2011-01-026-54/+202
| | | |
| * | | stop ignore java project configsFlorian Frank2011-01-021-7/+0
| | | |
| * | | make sure bytes is a 8-bit string on all rubiesFlorian Frank2011-01-021-2/+7
| | | |
| * | | Fix for ruby 1.9 const_defined? methodFlorian Frank2011-01-025-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | ruby 1.9 breaks backwards compatibility by usіng the wrong default value for its newly introduced second argument. This patch implements a work around, to make this gem work on both ruby 1.8 and 1.9.
| * | | obsoleted json/add/rails definitionsFlorian Frank2011-01-022-198/+4
| | | |
| * | | use JSON.iconv abstractionFlorian Frank2011-01-026-75/+25
| | | |
| * | | speed upShota Fukumori (sora_h)2011-01-021-4/+6
| | | |
| * | | never use iconvShota Fukumori (sora_h)2011-01-022-9/+14
| | | |
| * | | build jruby extension with RakefileFlorian Frank2011-01-026-983/+8
| |/ /
* | | stop ignore java project configsFlorian Frank2011-01-011-7/+0
| | |
* | | make sure bytes is a 8-bit string on all rubiesFlorian Frank2011-01-011-2/+7
| | |
* | | Fix for ruby 1.9 const_defined? methodFlorian Frank2011-01-015-8/+19
| | | | | | | | | | | | | | | | | | ruby 1.9 breaks backwards compatibility by usіng the wrong default value for its newly introduced second argument. This patch implements a work around, to make this gem work on both ruby 1.8 and 1.9.
* | | obsoleted json/add/rails definitionsFlorian Frank2011-01-012-198/+4
| | |
* | | use JSON.iconv abstractionFlorian Frank2011-01-016-75/+25
| | |
* | | speed upShota Fukumori (sora_h)2011-01-011-4/+6
| | |
* | | never use iconvShota Fukumori (sora_h)2011-01-012-9/+14
| | |
* | | started to build jruby extension with RakefileFlorian Frank2011-01-016-983/+8
|/ /
* | started to build jruby extension with RakefileFlorian Frank2010-09-2324-198/+268
|/
* silenced "already initialized constant" warningsFlorian Frank2010-09-173-2/+5
|
* use long instead of intFlorian Frank2010-09-172-27/+27
|
* better debugging messageFlorian Frank2010-08-202-2/+3
|
* Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-180-0/+0
|\ | | | | | | | | | | | | Conflicts: CHANGES VERSION lib/json/version.rb
View Lorry Controller Status