Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge pull request #228 from JuanitoFatas/patch/travis-new-build-env | Florian Frank | 2015-01-02 | 1 | -0/+3 | |
| | |\ \ | ||||||
| | | * | | Use the new build env on Travis. | Juanito Fatas | 2014-12-19 | 1 | -0/+3 | |
| | | |/ | ||||||
| | * | | Merge pull request #230 from jc00ke/patch-1 | Florian Frank | 2015-01-02 | 1 | -4/+2 | |
| | |\ \ | | | |/ | | |/| | ||||||
| | | * | CI with current rbx-2 | Jesse Cooke | 2014-12-25 | 1 | -4/+2 | |
| | |/ | ||||||
* | | | Bump version number to 1.8.2 | Florian Frank | 2015-01-09 | 4 | -5/+5 | |
* | | | Add to CHANGES | Florian Frank | 2015-01-09 | 1 | -0/+9 | |
* | | | Make generator format test backwards compatible | Michael Mac-Vicar | 2015-01-09 | 1 | -1/+1 | |
* | | | Use space_before as documented in the generator | Michael Mac-Vicar | 2015-01-09 | 1 | -0/+1 | |
* | | | Add test for format options used by the generator | Michael Mac-Vicar | 2015-01-09 | 1 | -0/+13 | |
* | | | Use the new build env on Travis. | Juanito Fatas | 2015-01-09 | 1 | -0/+3 | |
* | | | CI with current rbx-2 | Jesse Cooke | 2015-01-09 | 1 | -4/+2 | |
|/ / | ||||||
* | | Merge branch 'ruby220' of https://github.com/hsbt/json into zzak-ruby-2.2zzak-ruby-2.2 | Florian Frank | 2015-01-03 | 0 | -0/+0 | |
|\ \ | ||||||
| * | | fix to build fail with rb_str_new macro usage | SHIBATA Hiroshi | 2014-12-28 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'master' into zzak-ruby-2.2 | Florian Frank | 2015-01-02 | 7 | -94/+113 | |
|\ \ | ||||||
| * | | Improve JRuby perf. by removing source of multithreaded contention | Ben Browning | 2015-01-02 | 2 | -89/+91 | |
| * | | Added ruby-head to travis allowed-failures | Iain Beeston | 2015-01-02 | 1 | -0/+1 | |
| * | | Don't mutate JSON.dump_default_options from dump | Jason R. Clark | 2015-01-02 | 2 | -1/+7 | |
| * | | No binstubs | Florian Frank | 2015-01-02 | 1 | -1/+1 | |
| * | | Reindented | Florian Frank | 2015-01-02 | 1 | -7/+6 | |
| * | | Document `Rational` json generation methods. | Vipul A M | 2015-01-02 | 1 | -4/+10 | |
| * | | Document `Complex` json generation methods. | Vipul A M | 2015-01-02 | 1 | -1/+7 | |
| * | | Use method_defined? to check if method exists instead of slower check on inst... | Vipul A M | 2015-01-02 | 1 | -1/+1 | |
| * | | Update json-java.gemspec | Daniel Grippi | 2015-01-02 | 1 | -1/+1 | |
| * | | Change documentation to reflect new default value | Florian Frank | 2015-01-02 | 1 | -2/+2 | |
| * | | Fix typo in comment | Ignacio Galindo | 2015-01-02 | 1 | -1/+1 | |
* | | | Fall back to Data_* wrappers on ancient rubies | Florian Frank | 2015-01-02 | 5 | -1/+19 | |
* | | | Fix typo | Florian Frank | 2015-01-02 | 1 | -1/+1 | |
* | | | Merge branch 'ruby-2.2' of https://github.com/zzak/json into zzak-ruby-2.2 | Florian Frank | 2015-01-02 | 17 | -59/+125 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Ignore generated files | Zachary Scott | 2014-12-27 | 1 | -0/+2 | |
| * | | RUBY_TYPED_FREE_IMMEDIATELY isn't always available | Zachary Scott | 2014-12-27 | 3 | -33/+39 | |
| * | | Use ALLOC and MEMZERO instead of ZALLOC | Zachary Scott | 2014-12-26 | 1 | -1/+2 | |
| * | | Revert part of "Sync with trunk" | Zachary Scott | 2014-12-26 | 3 | -49/+0 | |
| * | | Ignore .bundle generated files | Zachary Scott | 2014-12-26 | 1 | -0/+1 | |
| * | | Add extconf from trunk | Zachary Scott | 2014-12-25 | 1 | -0/+3 | |
| * | | Only use gc stress assert if available | Zachary Scott | 2014-12-25 | 1 | -9/+11 | |
| * | | Sync tests with trunk | Zachary Scott | 2014-12-25 | 2 | -15/+11 | |
| * | | This file shouldn't be committed | Zachary Scott | 2014-12-25 | 3 | -281/+1 | |
| * | | bundle exec rake | Zachary Scott | 2014-12-25 | 3 | -3/+283 | |
| * | | Build on 2.2.0 too | Zachary Scott | 2014-12-25 | 1 | -0/+1 | |
| * | | This value has changed somehow | Zachary Scott | 2014-12-25 | 1 | -1/+1 | |
| * | | Sync with trunk | Zachary Scott | 2014-12-25 | 15 | -112/+197 | |
| |/ | ||||||
| * | Merge pull request #221 from iainbeeston/allow_ruby_head_to_fail | Florian Frank | 2014-11-05 | 1 | -0/+1 | |
| |\ | ||||||
| | * | Added ruby-head to travis allowed-failures | Iain Beeston | 2014-11-04 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge pull request #217 from jasonrclark/dont_mutate_dump_default_options | Florian Frank | 2014-09-26 | 2 | -1/+7 | |
| |\ | ||||||
| | * | Don't mutate JSON.dump_default_options from dump | Jason R. Clark | 2014-09-19 | 2 | -1/+7 | |
| |/ | ||||||
| * | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 3 | -5/+4 | |
| * | Fix documentation wording | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| * | Test on Ruby 2.1.x as well | Florian Frank | 2014-07-03 | 1 | -1/+1 | |
| * | Merge pull request #212 from vipulnsward/pass-typo | Florian Frank | 2014-07-03 | 4 | -13/+13 | |
| |\ | ||||||
| | * | - Pass over generator.c for grammar fixes. | Vipul A M | 2014-07-03 | 4 | -13/+13 | |
| |/ |