summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #130 from mihirk/masterMathias2015-05-061-0/+1
|\ | | | | Adding import of spray.json as well in the documentation which is requir...
| * Adding import of spray.json as well in the documentation which is required ↵mihirk2015-01-031-0/+1
| | | | | | | | for the case class object to be converted to json
* | Merge pull request #152 from fommil/patch-1Mathias2015-05-061-1/+3
|\ \ | | | | | | standard optionFormat type close #151
| * | standard optionFormat type close #151Sam Halliday2015-04-251-1/+3
| | |
* | | Merge pull request #153 from layerhq/expose-field-name-in-deserialization-errorsMathias2015-05-063-5/+19
|\ \ \ | |/ / |/| | Expose fieldName when able in deserialization errors
| * | Expose fieldName when able in deserialization errorsDan Checkoway2015-04-273-5/+19
|/ /
* | Merge pull request #149 from jroper/backwards-compatibilityMathias2015-04-231-1/+8
|\ \ | | | | | | Reinstated deprecated JsArray and JsObject List based constructors for backwards compatibility
| * | Reinstated deprecated JsArray and JsObject List based constructors for ↵James Roper2015-04-231-1/+8
|/ / | | | | | | backwards compatibility
* | Merge pull request #136 from fommil/patch-1Mathias2015-04-201-16/+13
|\ \ | | | | | | close #132
| * | close #132Sam Halliday2015-01-271-16/+13
| |/
* | Merge pull request #147 from markhatton/masterMathias2015-04-152-1/+5
|\ \ | | | | | | Fix parsing from bytes if first character of string is multi-byte
| * | = Fix multibyte chars at ix 0 of JSON String not being parsed correctly, ↵Mark Hatton2015-04-092-1/+5
|/ / | | | | | | closes #148
* | Upgrade dependenciesMathias2015-02-242-5/+5
| |
* | Small improvements to JsonParserMathias2015-02-241-7/+7
|/
* Prepare for release 1.3.1v1.3.1Mathias2014-10-283-3/+9
|
* Upgrade test dependenciesMathias2014-10-281-2/+3
|
* Add member name unmangling to ProductFormats, fixes #120Mathias2014-10-282-1/+39
|
* Fix OOE when parsing unterminated JSON strings, fixes #122Mathias2014-10-283-5/+13
|
* Merge pull request #123 from twillouer/patch-1Mathias2014-10-271-1/+1
|\ | | | | JSArray take now Vector as argument
| * JSArray take now Vector as argumentWilliam Delanoue2014-10-211-1/+1
|/
* Prepare for release 1.3.0v1.3.0Mathias2014-09-223-13/+18
|
* Merge pull request #117 from chris-martin/jsonFormat0Mathias2014-09-222-0/+28
|\ | | | | Add jsonFormat0 for fieldless case classes
| * Add jsonFormat0 for fieldless case classesChris Martin2014-09-152-0/+28
| | | | | | | | Closes #41
* | Fix small problem in JsonParser error reportingMathias2014-09-192-7/+22
| |
* | Improve JsonPrinter to enable printing to custom StringBuilderMathias2014-09-191-11/+9
| |
* | Switch JsArray(List) to JsArray(Vector), make parser produce ↵Mathias2014-09-199-75/+72
| | | | | | | | JsObject(HashMap) rather than JsObject(ListMap)
* | Small fix in READMEMathias2014-09-191-4/+4
| |
* | Switch to fast, hand-written parser, remove parboiled dependencyMathias2014-09-195-91/+295
| | | | | | | | Closes #86, #108
* | Upgrade SBT and plugins, remove Scala 2.9 support, bump version to 1.3-SNAPSHOTMathias2014-09-167-134/+17
|/
* Merge pull request #115 from rafael/patch-1Johannes Rudolph2014-08-141-16/+20
|\ | | | | Update README.markdown
| * Update README.markdownRafael Chacon2014-08-081-16/+20
|/ | | * Fix small issue with markdown so list enumeration works.
* Upgrade to Scala 2.11.0 and SBT 0.13.2Mathias2014-04-222-4/+4
|
* Prepare for release 1.2.6v1.2.6Mathias2014-04-103-4/+18
|
* Merge branch 'master' of github.com:spray/spray-jsonMathias2014-04-1022-75/+192
|\
| * Merge pull request #97 from gkossakowski/scala-2.11Johannes Rudolph2014-03-173-8/+9
| |\ | | | | | | Support for Scala 2.11
| | * Update to sbt 0.13.1.Grzegorz Kossakowski2014-03-173-4/+4
| | | | | | | | | | | | Also, update to latest versions of sbt plugins used in spray-json build.
| | * Support Scala 2.11 in the build definition file.Grzegorz Kossakowski2014-03-171-4/+5
| |/ | | | | | | | | Fix pattern matches to work with Scala 2.10 and 2.11 by just using the wildcard case.
| * upgrade to sbt boilerplate 0.5.1, fixes #96Johannes Rudolph2014-03-172-2/+2
| |
| * Add source for Conversions.png and instructions how to edit, refs #95Johannes Rudolph2014-03-132-0/+6
| |
| * Make sure BasicFormats never pass `null` into JsValue constructors, fixes #70Johannes Rudolph2014-03-131-4/+12
| |
| * Merge pull request #95 from NicholasSterling/masterJohannes Rudolph2014-03-131-0/+0
| |\ | | | | | | Change Spray Conversions diagram: asJson => parseJson
| | * Change Spray Conversions diagram: asJson => parseJsonNicholas Sterling2014-03-121-0/+0
| | |
| * | In Travis run tests for all cross-built scala versionsJohannes Rudolph2014-03-121-3/+1
| | |
| * | Merge commit 'pull/58'Johannes Rudolph2014-03-122-0/+13
| |\ \
| | * | Add OSGi metatadataMichael Pilquist2014-03-112-0/+13
| | | |
| * | | Add some scalachecks roundtrips for more confidence, fixes #29Johannes Rudolph2014-03-122-7/+76
| | | |
| * | | rename asJson => parseJson, fixes #89Johannes Rudolph2014-03-125-5/+7
| | | |
| * | | Merge pull request #94 from spray/i/43-better-printingJohannes Rudolph2014-03-123-21/+16
| |\ \ \ | | | | | | | | | | match spec tightly about which characters to encode, fixes #83, #46
| | * | | match spec tightly about which characters to encode, fixes #83, #46Johannes Rudolph2014-03-123-21/+16
| |/ / /
| * | | upgrade to Scala 2.10.3Johannes Rudolph2014-03-111-4/+4
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-14 09:48:47 +0000