summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into unifiedv1.4.6-javaDaniel Luz2010-08-093-2/+6
|\
| * prepare new versionv1.4.6Florian Frank2010-08-093-2/+6
| |
* | Java: keep track of depth correctlyDaniel Luz2010-08-091-0/+1
| |
* | Merge branch 'master' (early part) into unifiedDaniel Luz2010-08-092-5/+2
|\ \ | |/
| * keep track of depth correctlyFlorian Frank2010-08-082-5/+2
| |
* | Java: do not forget to dup the stateDaniel Luz2010-08-091-1/+1
| |
* | Merge branch 'master' (early part) into unifiedDaniel Luz2010-08-093-77/+77
|\ \ | |/
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-070-0/+0
| |\ | | | | | | | | | | | | Conflicts: tests/test_json_generate.rb
| | * do not forget to dup the stateFlorian Frank2010-08-072-2/+11
| | |
| * | do not forget to dup the stateFlorian Frank2010-08-073-77/+77
| |/ | | | | | | use state for depth checking in pure as well
* | Merge remote branch 'mernen/master'Charles Oliver Nutter2010-08-074-83/+110
|\ \
| * | Java: made the OptionsReader instantiation less sillyDaniel Luz2010-08-072-14/+9
| | |
| * | Java: fixed Generator::State setters for String valuesDaniel Luz2010-08-071-6/+3
| | |
| * | Java: copy depth in State#initialize_copyDaniel Luz2010-08-071-0/+1
| | |
| * | Added Java build files to gitignoreDaniel Luz2010-08-071-0/+13
| | |
| * | Merge remote branch 'flori/master'Daniel Luz2010-08-074-4/+59
| |\ \ | | |/
| * | Java: manage depth in stateDaniel Luz2010-08-072-63/+84
| | |
| * | Merge remote branch 'flori/master'Daniel Luz2010-08-076-102/+155
| |\ \
* | \ \ Merge remote branch 'flori/master'Charles Oliver Nutter2010-08-069-106/+214
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | do not freeze to allow chaging defaultsv1.4.5Florian Frank2010-08-072-3/+4
| | |
| * | added missing methods to State + testsFlorian Frank2010-08-072-1/+51
| | |
| * | changed CHANGESFlorian Frank2010-08-071-0/+4
| |/
| * mange depth in stateFlorian Frank2010-08-073-68/+120
| |
| * new versionFlorian Frank2010-08-062-2/+2
| |
| * some code cleanupFlorian Frank2010-08-062-32/+33
| |
* | Merge remote branch 'flori/master'v1.4.4-javaCharles Oliver Nutter2010-08-069-180/+277
|\ \ | |/
| * Prepare new versionv1.4.4Florian Frank2010-08-063-2/+6
| |
| * make sure to use toplevel ::EncodingFlorian Frank2010-08-061-8/+9
| |
| * changed documentationFlorian Frank2010-08-061-7/+5
| |
| * cleaned up code a bitFlorian Frank2010-08-061-12/+6
| |
| * use sdocFlorian Frank2010-08-061-1/+1
| |
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-050-0/+0
| |\ | | | | | | | | | | | | | | | Conflicts: ext/json/ext/generator/generator.c ext/json/ext/generator/generator.h
| | * Revert "use method dispatch for generation again"Florian Frank2010-08-054-271/+272
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 59eab2b7ad1b44dc424fb3fffa5520947f7360f3. Conflicts: ext/json/ext/generator/generator.c
| * | Revert "use method dispatch for generation again"Florian Frank2010-08-054-261/+293
| |/ | | | | | | | | | | | | | | This reverts commit 59eab2b7ad1b44dc424fb3fffa5520947f7360f3. Conflicts: ext/json/ext/generator/generator.c
| * Revert "use method dispatch for generation again"Florian Frank2010-08-052-30/+8
| | | | | | | | This reverts commit f0a14faf1d59a5ea86a79d3a5780e8433bfc9e16.
| * use method dispatch for generation againFlorian Frank2010-08-032-8/+30
| |
| * use rb_funcall for dupingFlorian Frank2010-08-031-3/+4
| | | | | | | | rbx doesn't support rb_obj_dup :-(
| * Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-08-032-3/+8
| |\
| * | use method dispatch for generation againFlorian Frank2010-07-243-197/+264
| | |
* | | Move json-jruby.gemspec to json-java.gemspec.Charles Oliver Nutter2010-08-031-0/+0
| | |
* | | Merge JRuby-compatible extension into json proper.Charles Oliver Nutter2010-08-0321-0/+6002
| |/ |/|
* | Zero out the generator struct to avoid GC problemsJake Douglas2010-08-031-0/+1
| |
* | Fix header conflict problem with OSX's ruby.frameworkEvan Phoenix2010-08-031-2/+6
| | | | | | | | | | Only look for ruby/re.h if compiling under 1.9, otherwise OS X stupidly picks up ruby/re.h from the ruby.framework, which conflicts.
* | fix tha use of REALLOC_N.NARUSE, Yui2010-05-091-1/+1
|/ | | | | From Ruby r27694 [ruby-dev:41227]. This caused build failure with SunStudio on sparc Solaris.
* Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-05-051-6/+6
|\
| * Fix wrong assertion: use assert_equal.NARUSE, Yui2010-05-031-6/+6
| | | | | | | | From Ruby r27587 and r27590, by nobu.
* | Fix for subclassed core classes, github issue 20v1.4.3Florian Frank2010-05-055-138/+145
|/ | | | | Fixed a problem in the 1.4.x versions, that caused subclasses of core classes to miss calling their to_json methods.
* Revert "simplified build structure"v1.4.2Joshua Peek2010-04-289-17/+20
| | | | This reverts 76e017a1b8a042bcb682b68821cc33f29788cd9a commit.
* new versionFlorian Frank2010-04-281-1/+1
|
* changed the CHANGESFlorian Frank2010-04-281-0/+2
|
View Lorry Controller Status