summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* enforce utf8 encoding in parsed stringsjruby-fix-encodingFlorian Frank2012-05-103-37/+52
|
* Work around jruby's inconsistent Time implement.Florian Frank2012-05-101-1/+4
|
* Fix string/regexp encoding mismatch in jrubyFlorian Frank2012-05-102-7/+13
|
* force jruby encoding after generationFlorian Frank2012-05-093-2/+6
|
* Prepare new versionFlorian Frank2012-05-095-4/+6
|
* Merge branch 'nobu-master'Florian Frank2012-05-076-6/+17
|\
| * Fix parser dependenciesnobu-masterFlorian Frank2012-05-073-7/+7
| |
| * comment-out unused functionsNobuyoshi Nakada2012-05-072-0/+9
| |
| * add depend filesNobuyoshi Nakada2012-05-072-0/+2
| |
* | Stop adding 'ext' paths to LOAD_PATHluislavena-stop-polluting-load-pathLuis Lavena2012-05-062-4/+2
|/ | | | | | | RubyGems will automatically copy the generated extension inside to 'lib' when doing `make install` This change let RubyGems do it's job and it works.
* new version 1.7.0v1.7.0Florian Frank2012-04-284-8/+8
|
* Add JSON::GenericObjectFlorian Frank2012-04-285-15/+46
|
* Merge branch 'master' of github.com:/flori/jsonv1.6.7Florian Frank2012-04-280-0/+0
|\ | | | | | | | | | | | | Conflicts: ext/json/ext/generator/generator.c json.gemspec json_pure.gemspec
| * change the CHANGESv1.6.6Florian Frank2012-03-261-1/+4
| |
| * Use newest rubygems versionFlorian Frank2012-03-262-9/+9
| |
| * Add a comment mentioning some limitiationFlorian Frank2012-03-261-0/+5
| |
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2012-03-264-11/+20
| |\
| | * Merge branch 'fix-regex-stack-overflow'Florian Frank2012-03-211-21/+6
| | |\
| | | * Fix the fixfix-regex-stack-overflowFlorian Frank2012-03-211-21/+6
| | | |
| | * | Merge branch 'master' of github.com:/flori/jsonFlorian Frank2012-03-201-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge pull request #123 from plentz/patch-1Florian Frank2012-02-151-1/+1
| | | |\ | | | | | | | | | | Making the travis badge visible
| | | | * making the travis badge visible :)Diego Plentz2012-02-141-1/+1
| | | |/
| * | | Add simplecov to test groupFlorian Frank2012-03-151-1/+1
| | |/ | |/|
* | | new version 1.6.7Florian Frank2012-04-285-10/+12
| | |
* | | Throw exception unless source is a stringFlorian Frank2012-04-273-17/+21
| | |
* | | Rename test names according to fileFlorian Frank2012-04-279-14/+14
| | |
* | | new rubygemsFlorian Frank2012-04-272-4/+4
| | |
* | | Add implementation for a light objectFlorian Frank2012-04-276-11/+29
| | |
* | | Add implementation for a light objectFlorian Frank2012-04-272-0/+38
| | |
* | | change the CHANGESFlorian Frank2012-04-271-1/+4
| | |
* | | Add a comment mentioning some limitiationFlorian Frank2012-04-271-0/+5
| | |
* | | Add simplecov to test groupFlorian Frank2012-04-271-1/+1
| | |
* | | newewst rubygems versionFlorian Frank2012-04-182-4/+4
| | |
* | | remove unused variableFlorian Frank2012-04-181-1/+1
| | |
* | | Fix the fixFlorian Frank2012-04-181-21/+6
| | |
* | | making the travis badge visible :)Diego Plentz2012-04-181-1/+1
| |/ |/|
* | Use C implementation and better regexp for pureFlorian Frank2012-03-203-10/+34
|/
* Clean up code a bitFlorian Frank2012-02-1150-24896/+93
| | | | This should fix #117
* configure travisFlorian Frank2012-02-115-9/+8
|
* Propagate src encoding to values made from it (fixes 1.9 mode converting ↵Thomas E. Enebo2012-02-111-0/+1
| | | | everything to ascii-8bit; harmless for 1.8 mode too)
* Prepare new versionv1.6.5Florian Frank2012-01-155-8/+13
|
* The behavior of reference to inner defined variable is undefined.NARUSE, Yui2012-01-152-2/+2
| | | | | https://bugs.ruby-lang.org/issues/5888 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
* Add test-unit as test group dependencyHiroshi Nakamura2012-01-061-0/+4
| | | | | | | | | When we run 'rake test' through bundler like 'bundle exec rake test', we need test-unit gem installed. It's because testrb in bundler gem activates 'test-unit' gem in contrast stock testrb in Ruby dist doesn't. I'm suspecting it's a bug of bundler but it might be good to add 'test-unit' to Gemfile for a workaround because Gemfile is for bundler.
* Add to CHANGESv1.6.4Florian Frank2011-12-241-0/+4
|
* Prepare new versionFlorian Frank2011-12-244-10/+10
|
* Merge branch 'more_jruby_tweaks' of https://github.com/headius/json into ↵Florian Frank2011-12-212-88/+94
|\ | | | | | | headius-more_jruby_tweaks
| * Only allocate a single "view" bytelist, and update it as needed.Charles Oliver Nutter2011-12-202-88/+94
| | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl
* | Merge branch 'hash-duckyped-object_classes'Florian Frank2011-12-212-4/+0
|\ \ | |/ |/|
| * Remove superflous commentFlorian Frank2011-12-212-4/+0
| |
* | Fix #109Florian Frank2011-12-202-0/+0
|/