| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #130 from mihirk/master | Mathias | 2015-05-06 | 1 | -0/+1 |
|\ |
|
| * | Adding import of spray.json as well in the documentation which is required fo... | mihirk | 2015-01-03 | 1 | -0/+1 |
* | | Merge pull request #152 from fommil/patch-1 | Mathias | 2015-05-06 | 1 | -1/+3 |
|\ \ |
|
| * | | standard optionFormat type close #151 | Sam Halliday | 2015-04-25 | 1 | -1/+3 |
* | | | Merge pull request #153 from layerhq/expose-field-name-in-deserialization-errors | Mathias | 2015-05-06 | 3 | -5/+19 |
|\ \ \
| |/ /
|/| | |
|
| * | | Expose fieldName when able in deserialization errors | Dan Checkoway | 2015-04-27 | 3 | -5/+19 |
|/ / |
|
* | | Merge pull request #149 from jroper/backwards-compatibility | Mathias | 2015-04-23 | 1 | -1/+8 |
|\ \ |
|
| * | | Reinstated deprecated JsArray and JsObject List based constructors for backwa... | James Roper | 2015-04-23 | 1 | -1/+8 |
|/ / |
|
* | | Merge pull request #136 from fommil/patch-1 | Mathias | 2015-04-20 | 1 | -16/+13 |
|\ \ |
|
| * | | close #132 | Sam Halliday | 2015-01-27 | 1 | -16/+13 |
| |/ |
|
* | | Merge pull request #147 from markhatton/master | Mathias | 2015-04-15 | 2 | -1/+5 |
|\ \ |
|
| * | | = Fix multibyte chars at ix 0 of JSON String not being parsed correctly, clos... | Mark Hatton | 2015-04-09 | 2 | -1/+5 |
|/ / |
|
* | | Upgrade dependencies | Mathias | 2015-02-24 | 2 | -5/+5 |
* | | Small improvements to JsonParser | Mathias | 2015-02-24 | 1 | -7/+7 |
|/ |
|
* | Prepare for release 1.3.1v1.3.1 | Mathias | 2014-10-28 | 3 | -3/+9 |
* | Upgrade test dependencies | Mathias | 2014-10-28 | 1 | -2/+3 |
* | Add member name unmangling to ProductFormats, fixes #120 | Mathias | 2014-10-28 | 2 | -1/+39 |
* | Fix OOE when parsing unterminated JSON strings, fixes #122 | Mathias | 2014-10-28 | 3 | -5/+13 |
* | Merge pull request #123 from twillouer/patch-1 | Mathias | 2014-10-27 | 1 | -1/+1 |
|\ |
|
| * | JSArray take now Vector as argument | William Delanoue | 2014-10-21 | 1 | -1/+1 |
|/ |
|
* | Prepare for release 1.3.0v1.3.0 | Mathias | 2014-09-22 | 3 | -13/+18 |
* | 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 |