Commit Graph
100 Commits
Author SHA1 Message Date
James Newton-King 7c57b1663c -Merge documentation proof read 2015-02-15 13:57:37 +13:00
James Newton-King 20f66cdac9 -Fixed incorrect JTokenReader.Path in certain situations 2015-02-15 13:54:08 +13:00
James Newton-King 432a6e8945 -Build
-Documentation
2015-02-01 03:24:00 +13:00
James Newton-King 2fe55480f2 Merge branch '7.0.1-new' 2015-01-29 23:35:25 +13:00
James Newton-King ca76003256 -Updated Json.NET Schema URL 2015-01-29 21:11:06 +13:00
James Newton-King e8ca53e788 -Fixed deserializing empty strings in Hashtables 2015-01-27 00:00:53 +13:00
James Newton-King 0657fd9b44 -Updated urls 2015-01-25 16:28:25 +13:00
James Newton-King a94c2d5192 -Documentation 2015-01-19 23:45:26 +13:00
James Newton-King e96f1f036b -Derp 2015-01-13 22:06:43 +13:00
James Newton-King 4bc6e27e72 -Increment version to 7.0.1 2015-01-13 21:52:29 +13:00
James Newton-King 2dd8799b06 -Merge 7.0.1 changes 2015-01-13 21:38:10 +13:00
James Newton-King 8b7b699e1d -Marked old JsonSchema implementation as obsolete
-License headers
-Documentation
-Build
2015-01-13 21:31:35 +13:00
James Newton-King 1497343173 -Protect against multiple attributes error 2015-01-11 19:46:39 +13:00
James Newton-King 569ca0b5f9 Merge branch 'master' into 6.0.8 2015-01-11 19:10:14 +13:00
James Newton-King 3936094b66 -WinRT build 2015-01-11 18:17:45 +13:00
James Newton-King ec6c64c8b6 -WinRT build 2015-01-11 17:37:20 +13:00
James Newton-King 773610fbdf -Changed version to 6.0.8 2015-01-11 17:03:08 +13:00
James Newton-King 6c1e1bfcba -Added support for serializing const fields
-Fixed tests
2015-01-11 16:54:10 +13:00
James Newton-King 9a4f96aa8f -Fixed using MetadataTypeAttribute with proxies
-Fixed error when deserializing undeserializable collections
2015-01-11 14:32:52 +13:00
James Newton-King 88b1e5c49a -Build 2015-01-10 22:54:36 +13:00
James Newton-King 5399c074a3 -Build 2014-12-31 15:31:16 +13:00
James Newton-King 20e9351c15 -Documentation 2014-12-30 22:21:55 +13:00
James Newton-King bc1a58e717 -Documentation 2014-12-29 15:47:26 +13:00
James Newton-King 78bc6c8bc3 -License headers 2014-12-29 12:46:13 +13:00
James Newton-King c714bae747 -Marked old JsonSchema implementation as obsolete 2014-12-29 12:15:18 +13:00
James Newton-King a2e15adf80 -Added AttributeProvider
-Increament version to 7.0.1
2014-12-23 10:57:17 +00:00
James Newton-King d22b5fd534 -Fixed WinRT 2014-12-23 11:58:22 +13:00
James Newton-King 25814e5a6c -Upgrade System.Collections.Immutable 2014-12-22 22:11:22 +00:00
James Newton-King 5d34cedcb3 -Build 2014-12-23 00:49:27 +13:00
James Newton-King a09f240f51 -Fixed CI 2014-12-22 17:16:10 +13:00
James Newton-King f760b78fbe -Added JToken.AncestorsAndSelf
-Added Extensions.AncestorsAndSelf and Extensions.DescendantsAndSelf
-Tests
2014-12-22 17:05:13 +13:00
James Newton-King 33ae4624bd -Fixed WinRT 2014-12-22 15:09:35 +13:00
James Newton-King 6155894321 Merge remote-tracking branch 'origin/json-schema' 2014-12-22 14:36:41 +13:00
James Newton-King e9dc993fc3 -Explicit culture for tests
-Tests
2014-12-22 00:11:57 +13:00
James Newton-King 55ccac4d92 -Added CurrentToken to JTokenWriter
-Added WriteToken(JsonToken, object) to JsonWriter
2014-12-17 19:38:39 +13:00
James Newton-King 9c2a1d853d -Fixed build 2014-12-07 16:31:52 +13:00
James Newton-King 82025bc5b7 -Added JContainer.DescendantsAndSelf
-Added CurrentToken to JTokenReader
2014-12-07 16:08:27 +13:00
James Newton-King fbaf3659d0 -Build 2014-12-02 14:17:09 +13:00
James Newton-King 2821b141d7 -Updated psake
-Build
2014-12-02 13:52:49 +13:00
James Newton-King 970a07ec5a -Build 2014-12-02 13:04:22 +13:00
James Newton-King 0dfe5024f0 -Build 2014-12-02 12:43:21 +13:00
James Newton-King 7399216c6f -Changed JsonContractType to always have all options 2014-12-02 11:08:16 +13:00
James Newton-King a764d4b0e1 Merge branch 'json-schema' of github.com:JamesNK/Newtonsoft.Json into json-schema 2014-12-02 00:43:29 +13:00
James Newton-King 209c10ddde -Explicit enum values 2014-12-02 00:43:01 +13:00
James Newton-King 0e6887da49 -Updated README.md with new logo location 2014-12-01 00:16:25 +13:00
James Newton-King 1c09507d9f -Fixed WinRT 2014-11-30 23:00:15 +13:00
James Newton-King 4a19ecd940 -Incremented version to 6.07 2014-11-30 21:41:56 +13:00
James Newton-King d5af34c790 -Schema InternalsVisibleTo 2014-11-30 21:27:44 +13:00
James Newton-King 449f4dd841 -Tests
-Documentation
2014-11-30 21:10:54 +13:00
James Newton-King b3b5a60bdb -Upgraded documentation to use latest Sandcastle
-Changed documentation conceptual references to links
2014-11-29 16:29:33 +13:00
James Newton-King fea3ffddeb -Fixed array XML documentation references 2014-11-29 16:25:16 +13:00
James Newton-King 68ebba03fb -Fixed casting a nullable negative SByte value 2014-11-29 00:28:33 +13:00
James Newton-King ed80d49e6e -Cleanup solution files 2014-11-24 22:16:39 +13:00
James Newton-King cfa51f5f58 Merge pull request #429 from yeroo/master
Bug: Unexpected token: Comment
2014-11-24 22:03:11 +13:00
James Newton-King 04e9048d10 -Refactor 2014-11-24 22:01:53 +13:00
James Newton-King b5ef767774 Merge branch 'Inverness-feature-iserializable-references' 2014-11-11 19:01:47 +13:00
James Newton-King 93e1113fa2 -Refactor 2014-11-11 19:01:27 +13:00
James Newton-King 7d38287972 Merge branch 'feature-iserializable-references' of https://github.com/Inverness/Newtonsoft.Json into Inverness-feature-iserializable-references 2014-11-11 12:08:47 +13:00
James Newton-King 1816f555ea -Fixed tests
-Fixed exception message line breaks to use Environment.NewLine
2014-11-11 12:06:30 +13:00
James Newton-King 7b4995523b -Fixed (hopefully) MetadataTypeAttribute not being found on some platforms 2014-11-05 16:33:53 -08:00
James Newton-King d316425746 -Fixed settings not being used when deserializing F# unions 2014-11-05 16:25:57 -08:00
James Newton-King 52d54d50e7 -Fixed deserializing complex values inside multi-dimensional arrays 2014-11-03 16:10:08 -08:00
James Newton-King 3fa2949a38 -Fixed error when extension data bag doesn't inherit from Dictionary<TKey, TValue> 2014-11-03 13:29:57 -08:00
James Newton-King fbf24eed69 -Refactor 2014-11-01 14:37:54 +13:00
James Newton-King 55e482c930 -Fixed deserializing null value onto JObject or JArray proeprty 2014-11-01 10:10:29 +13:00
James Newton-King 70d3e9327d -Documentation 2014-10-20 20:18:22 +13:00
James Newton-King ac98329006 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2014-10-20 19:54:30 +13:00
James Newton-King f88d2a42d8 -Documentation 2014-10-20 19:53:56 +13:00
James Newton-King 04d9d3181a -Tests 2014-10-20 18:52:21 +13:00
James Newton-King 703b30f9d1 -Build 2014-10-19 23:39:19 +13:00
James Newton-King 697e31444c -Changed MetadataTypeAttribute to use GetCustomeAttributes to support .NET 4.0 PCL 2014-10-19 23:11:58 +13:00
James Newton-King bc40ef0a4c -Reverted iOS NuGet target
-Readme.txt
2014-10-19 19:53:49 +13:00
James Newton-King 7011940383 -Fixed build 2014-10-19 18:53:19 +13:00
James Newton-King c7f8d85cc4 -Fixed tests
-Changed JTokenReader to provide line numbers for end tokens
2014-10-19 18:29:34 +13:00
James Newton-King 15906f1f36 -Automated aspnetcore50 tests in build script
-Documentation
2014-10-19 15:51:56 +13:00
James Newton-King 103395618b -Added WinRT tests to build script 2014-10-18 18:37:19 +13:00
James Newton-King 88a29704da -Fixed jsonpath error when parsing a property that follows an escaped property
-Changed reader/writer/token path to escape property names containing special characters
2014-10-18 15:36:42 +13:00
James Newton-King 01f1c5e261 -Fixed test error caused by StringDictionary now implementing IDictionary<string, string> 2014-10-18 08:36:05 +13:00
James Newton-King 88eeb8ba92 -Fixed MetadataTypeAttribute reflection bug by using CustomAttributeData
-Fixed immutable collections bug by getting type from known assembly
-Added support from running tests on aspnetcore50
2014-10-18 00:00:26 +13:00
James Newton-King 4d09aca2c1 -Fixed WinRT build 2014-10-17 10:41:36 +13:00
James Newton-King b550aac6d6 -Updated version to 6.0.6
-Fixed WinRT build
2014-09-29 16:18:13 +13:00
James Newton-King 1337c4f7f7 -Performance 2014-09-28 16:19:18 +13:00
James Newton-King 21eb43e3b3 -Added xamarinios10 to .NET 4.0 portable build
-Added aspnetcore50 to .NET 4.5 portable build
2014-09-25 22:33:53 +12:00
James Newton-King 83bede562f Merge pull request #383 from spadfield/fix/bson-guid-deserialization
Fix InvalidCastException when deserializing a GUID from BSON.
2014-09-25 21:28:44 +12:00
James Newton-King fc5134fbcc Merge pull request #380 from tamizhvendan/master
Removing the redundant requirement of having "fields property with empty array"
2014-09-25 21:09:00 +12:00
James Newton-King 6a22345e28 -Bug fix 2014-09-25 21:04:24 +12:00
James Newton-King 2faf5059bf Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2014-09-25 20:29:01 +12:00
James Newton-King 64ffa098b9 -Fixed null reference error when using JEnumerable created with default constructor
-Tests
2014-09-25 20:28:47 +12:00
James Newton-King 060c7e9cbd Merge pull request #377 from BrandonLWhite/bw-JsonConverterArgs
Implemented support for passing arguments to parameterized JsonConverter constructors
2014-09-23 12:46:38 +12:00
James Newton-King 77a3a2c65c Merge pull request #379 from dogwatch/patch-1
Added JsonConvert.ToString(string, StringEscapeHandling)
2014-09-23 12:43:15 +12:00
James Newton-King b3e667fa78 -Fixed tests 2014-09-12 23:56:17 +12:00
James Newton-King 99df43eb4d -Tests line endings 2014-09-12 23:34:20 +12:00
James Newton-King a09c2110e8 -Fixed WinRT build 2014-09-12 21:43:17 +12:00
James Newton-King dfb2ac17a5 -Refactor ExceptionAssert 2014-09-12 21:33:53 +12:00
James Newton-King 4b9ce67ab7 -Fixed WinRT build 2014-09-12 20:55:20 +12:00
James Newton-King 6bb1b77fa4 -Fixed tests 2014-09-12 20:14:53 +12:00
James Newton-King 2fc8638d59 -Fixed test 2014-09-11 15:34:20 +12:00
James Newton-King 7fcd12e2cf -Fixed build 2014-09-10 20:25:35 +12:00
James Newton-King a0f9df8a14 Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json 2014-09-10 20:04:48 +12:00
James Newton-King 352e52dda0 -Tests
-Documentation
2014-09-10 20:04:39 +12:00