summaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* Treat ASCII_8BIT as UTF-8 by defaultFlorian Frank2016-06-033-91/+85
* Remove quirks modeFlorian Frank2016-06-026-540/+126
* Merge branch 'v1.8'Florian Frank2016-02-2513-29/+25
|\
| * Call OBJECT_HANDLER for objects without #to_jsonFlorian Frank2016-02-251-5/+8
| * Remove remnants of GPL licensesFlorian Frank2015-09-1113-24/+17
* | Remove generate restriction for […]/{…}Florian Frank2015-06-131-32/+0
|/
* Improve JRuby perf. by removing source of multithreaded contentionBen Browning2015-01-022-89/+91
* Fix documentation wordingFlorian Frank2014-07-031-1/+1
* Try to convert first with to_hash, then to_hFlorian Frank2013-02-211-2/+3
* Security fix create_additons/JSON::GenericObjectv1.7.7Florian Frank2013-02-112-2/+2
* fix a bug in the JRuby implementation. getInstanceVariable() can return a nul...John Shahid2013-02-041-1/+2
* Increase hash likeness of State objectsFlorian Frank2012-12-311-2/+18
* add merge alias for configure in jrubyFlorian Frank2012-11-291-1/+1
* Change actual rl filessferik-max_nestingFlorian Frank2012-10-072-3/+3
* Increase default max_nesting to 100Erik Michaels-Ober2012-10-052-2/+2
* enforce utf8 encoding in parsed stringsjruby-fix-encodingFlorian Frank2012-05-103-37/+52
* force jruby encoding after generationFlorian Frank2012-05-091-0/+4
* Propagate src encoding to values made from it (fixes 1.9 mode converting ever...Thomas E. Enebo2012-02-111-0/+1
* Merge branch 'more_jruby_tweaks' of https://github.com/headius/json into head...Florian Frank2011-12-212-88/+94
|\
| * Only allocate a single "view" bytelist, and update it as needed.Charles Oliver Nutter2011-12-202-88/+94
* | 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
|/
* Support duck typed ruby array in JRuby as wellFlorian Frank2011-12-202-16/+16
* Support hash ducktype objects on JRuby as wellFlorian Frank2011-12-203-49/+58
* Only allocate a single ParserResult, and pass it along the stack.headius-jruby_perf_tweaksCharles Oliver Nutter2011-12-202-141/+170
* Better ByteList subsequence and break up some parse methods.Charles Oliver Nutter2011-12-202-84/+126
* Use appropriate byteListToInum for Ruby version.Charles Oliver Nutter2011-12-201-1/+3
* Minor tweaks to Java ext for performance.Charles Oliver Nutter2011-12-202-116/+128
* support buffer length settingsFlorian Frank2011-11-231-0/+21
* Extract utils out of this library into json-utilsv1.6.0Florian Frank2011-09-131-80/+84
* Add some documentationv1.5.4Florian Frank2011-08-312-1/+6
* Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-313-131/+470
|\
| * Implement quirks_modeFlorian Frank2011-07-313-109/+448
* | started quirks mode for generatorFlorian Frank2011-07-279-72/+96
|/
* Ported fixes from fix_memory_leak into Parser.rlFlorian Frank2011-07-082-85/+107
* 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
* | Don't optimize calls for ducktypesFlorian Frank2011-05-122-27/+35
* | Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-05-122-17/+25
|\ \ | |/ |/|
| * use []= method if objectClass isn't a HashFlorian Frank2011-05-112-17/+25
* | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-1/+1
* | flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-5/+1
|/
* renamed :match argument to :match_stringv1.5.0Florian Frank2011-01-052-10/+10
* avoid object creationFlorian Frank2011-01-032-42/+38
* implement string matching for java parserFlorian Frank2011-01-023-102/+169
* started to build jruby extension with RakefileFlorian Frank2010-09-2315-0/+5044