| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #117 from chris-martin/jsonFormat0 | Mathias | 2014-09-22 | 2 | -0/+28 |
| |\ |
|
| | * | Add jsonFormat0 for fieldless case classes | Chris Martin | 2014-09-15 | 2 | -0/+28 |
| * | | Fix small problem in JsonParser error reporting | Mathias | 2014-09-19 | 2 | -7/+22 |
| * | | Improve JsonPrinter to enable printing to custom StringBuilder | Mathias | 2014-09-19 | 1 | -11/+9 |
| * | | Switch JsArray(List) to JsArray(Vector), make parser produce JsObject(HashMap... | Mathias | 2014-09-19 | 9 | -75/+72 |
| * | | Small fix in README | Mathias | 2014-09-19 | 1 | -4/+4 |
| * | | Switch to fast, hand-written parser, remove parboiled dependency | Mathias | 2014-09-19 | 5 | -91/+295 |
| * | | Upgrade SBT and plugins, remove Scala 2.9 support, bump version to 1.3-SNAPSHOT | Mathias | 2014-09-16 | 7 | -134/+17 |
| |/ |
|
| * | Merge pull request #115 from rafael/patch-1 | Johannes Rudolph | 2014-08-14 | 1 | -16/+20 |
| |\ |
|
| | * | Update README.markdown | Rafael Chacon | 2014-08-08 | 1 | -16/+20 |
| |/ |
|
| * | Upgrade to Scala 2.11.0 and SBT 0.13.2 | Mathias | 2014-04-22 | 2 | -4/+4 |
| * | Prepare for release 1.2.6v1.2.6 | Mathias | 2014-04-10 | 3 | -4/+18 |
| * | Merge branch 'master' of github.com:spray/spray-json | Mathias | 2014-04-10 | 22 | -75/+192 |
| |\ |
|
| | * | Merge pull request #97 from gkossakowski/scala-2.11 | Johannes Rudolph | 2014-03-17 | 3 | -8/+9 |
| | |\ |
|
| | | * | Update to sbt 0.13.1. | Grzegorz Kossakowski | 2014-03-17 | 3 | -4/+4 |
| | | * | Support Scala 2.11 in the build definition file. | Grzegorz Kossakowski | 2014-03-17 | 1 | -4/+5 |
| | |/ |
|
| | * | upgrade to sbt boilerplate 0.5.1, fixes #96 | Johannes Rudolph | 2014-03-17 | 2 | -2/+2 |
| | * | Add source for Conversions.png and instructions how to edit, refs #95 | Johannes Rudolph | 2014-03-13 | 2 | -0/+6 |
| | * | Make sure BasicFormats never pass `null` into JsValue constructors, fixes #70 | Johannes Rudolph | 2014-03-13 | 1 | -4/+12 |
| | * | Merge pull request #95 from NicholasSterling/master | Johannes Rudolph | 2014-03-13 | 1 | -0/+0 |
| | |\ |
|
| | | * | Change Spray Conversions diagram: asJson => parseJson | Nicholas Sterling | 2014-03-12 | 1 | -0/+0 |
| | * | | In Travis run tests for all cross-built scala versions | Johannes Rudolph | 2014-03-12 | 1 | -3/+1 |
| | * | | Merge commit 'pull/58' | Johannes Rudolph | 2014-03-12 | 2 | -0/+13 |
| | |\ \ |
|
| | | * | | Add OSGi metatadata | Michael Pilquist | 2014-03-11 | 2 | -0/+13 |
| | * | | | Add some scalachecks roundtrips for more confidence, fixes #29 | Johannes Rudolph | 2014-03-12 | 2 | -7/+76 |
| | * | | | rename asJson => parseJson, fixes #89 | Johannes Rudolph | 2014-03-12 | 5 | -5/+7 |
| | * | | | Merge pull request #94 from spray/i/43-better-printing | Johannes Rudolph | 2014-03-12 | 3 | -21/+16 |
| | |\ \ \ |
|
| | | * | | | match spec tightly about which characters to encode, fixes #83, #46 | Johannes Rudolph | 2014-03-12 | 3 | -21/+16 |
| | |/ / / |
|
| | * | | | upgrade to Scala 2.10.3 | Johannes Rudolph | 2014-03-11 | 1 | -4/+4 |
| | * | | | add travis metadata | Johannes Rudolph | 2014-03-11 | 1 | -0/+12 |
| | * | | | Only catch NonFatal exceptions | Johannes Rudolph | 2014-03-11 | 1 | -1/+2 |
| | * | | | Fix error introduced in 3f56c8f (#92) | Johannes Rudolph | 2014-03-11 | 1 | -5/+6 |
| | * | | | Merge pull request #91 from fractaloop/issue-90-escape-control-characters | Johannes Rudolph | 2014-03-11 | 2 | -1/+2 |
| | |\ \ \ |
|
| | | * | | | Modify the JsonPrinter to escape all characters less than 0x20 | Logan Lowell | 2014-02-25 | 1 | -1/+1 |
| | | * | | | Add a failing line to the test | Logan Lowell | 2014-02-25 | 1 | -0/+1 |
| | | |/ / |
|
| | * | | | Merge pull request #92 from theon/master | Johannes Rudolph | 2014-03-11 | 2 | -6/+6 |
| | |\ \ \
| | |/ /
| |/| | |
|
| | | * | | Make printer methods protected, so they can be overridden | Ian Forsey | 2014-03-06 | 2 | -6/+6 |
| | |/ / |
|
| | * | | Merge pull request #88 from NicholasSterling/master | Johannes Rudolph | 2014-02-24 | 1 | -0/+0 |
| | |\| |
|
| | | * | Cleaned up and added to Conversions diagram | Nicholas Sterling | 2014-02-22 | 1 | -0/+0 |
| | |/ |
|
| | * | Merge pull request #84 from martijnhoekstra/slashtest | Mathias | 2014-02-03 | 1 | -0/+3 |
| | |\ |
|
| | | * | add test case for all slash posibilities | Martijn Hoekstra | 2014-02-03 | 1 | -0/+3 |
| | |/ |
|
| | * | Merge pull request #82 from NicholasSterling/master | Johannes Rudolph | 2014-01-20 | 2 | -19/+26 |
| | |\ |
|
| | | * | Add image showing possible conversions to README | Nicholas Sterling | 2014-01-20 | 2 | -19/+26 |
| | |/ |
|
| * / | Upgrade to Scala 2.10.4, parboiled 1.1.6 and specs2 2.3.10 | Mathias | 2014-04-09 | 1 | -5/+5 |
| |/ |
|
| * | Upgrade to SBT 0.12.4 | Mathias | 2013-11-21 | 1 | -1/+1 |
| * | README: fix numbering | Johannes Rudolph | 2013-10-26 | 1 | -8/+4 |
| * | Merge pull request #76 from markvandertol/staticfields | Johannes Rudolph | 2013-10-14 | 2 | -1/+18 |
| |\ |
|
| | * | Ignore static fields in jsonFormat | Mark van der Tol | 2013-10-13 | 2 | -1/+18 |
| |/ |
|
| * | Merge pull request #75 from anishathalye/bug-hexdigit | Johannes Rudolph | 2013-10-01 | 1 | -1/+1 |
| |\ |
|
| | * | Fix bug with invalid hex digits in JsonParser | Anish Athalye | 2013-09-27 | 1 | -1/+1 |
| |/ |
|
