sean-m
/
jsondiffpatch.net
mirror of https://github.com/wbish/jsondiffpatch.net.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
128 Commits
1 Branch
0 Tags
2 MiB
Commit Graph

128 Commits (master)

Author SHA1 Message Date
William Bishop c2b2458823 Update JsonDeltaFormatterUnitTests.cs 2023-01-16 17:02:08 -06:00
William Bishop 88937bdf8e
Merge pull request #43 from adam-mccoy/master 
Fix obscure bug with array sorting
 2023-01-16 16:29:11 -06:00
William Bishop cf4373e441
Merge branch 'master' into master 2023-01-16 16:29:05 -06:00
William Bishop 483f897751
Merge pull request #58 from vooba/ObjectHash 
Implementation of Object Hash
 2023-01-16 16:27:49 -06:00
William Bishop baaad880cc
Merge pull request #61 from lingbohome/master 
fix: escape the key with ~ or/in its the json Pointer name
 2023-01-16 16:27:35 -06:00
William Bishop 0d6bf19c9f
Merge pull request #64 from wbish/dependabot/nuget/Src/JsonDiffPatchDotNet/Newtonsoft.Json-13.0.2 
Bump Newtonsoft.Json from 11.0.1 to 13.0.2 in /Src/JsonDiffPatchDotNet
 2023-01-16 16:26:52 -06:00
dependabot[bot] f71f76e1de
Bump Newtonsoft.Json from 11.0.1 to 13.0.2 in /Src/JsonDiffPatchDotNet 
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 11.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/11.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-07 21:25:04 +00:00
lingbo 9c557daf91 fix: escape the key with ~ or/in its the json Pointer name 2022-02-01 21:45:02 +08:00
Mathias Kolb dd7ace5338 feat: implement object hash 
based on pull request #52
fixes #54, #42
 2021-09-08 12:30:08 +02:00
Mathias Kolb 8f91145d61 fix: lcs backtrack function 
function know search the matrix from bottom right to top left
 2021-09-08 12:23:36 +02:00
Mathias Kolb c98bb3f378 Merge remote-tracking branch 'khiemnd777/master' 
Conflicts:
              Src/JsonDiffPatchDotNet/JsonDiffPatch.cs
	Src/JsonDiffPatchDotNet/Options.cs
 2021-07-20 08:48:11 +02:00
Adam McCoy 078ccf1ce2 Use stable sort 2020-11-29 00:46:13 +11:00
Adam McCoy 8cd59b6532 Add test to cover issue with unstable array sort 2020-11-29 00:43:18 +11:00
William Bishop d0abb0e7a7 Bump version to 2.3.0.0 2020-11-27 21:22:13 -06:00
William Bishop cf577b1753
Merge pull request #46 from RyanObray/master 
Property Filter and Patch Behavior Solution (Resolves #34)
 2020-11-27 21:16:49 -06:00
Ryan Obray c40cf5dcff Resolves #34. This change extends the capabilities of the Option class that is leveraged by JsonDiffPatch to apply diff patches. This change introduces an ExcludePaths property that allows you to specify the paths of the properties that you want the patch process to ignore. This is useful for preventing Id or other sensitive fields from being updated. This change also introduces a DiffBehaviors property that allows you to modify the behavior of the diff patch process. Specifying a behavior of IgnoreMissingProperties will prevent the patch process from deleting properties from the source object that aren't specified in the patch object, creating an avenue for partial updates to be applied. Specifying a behavior of IgnoreNewProperties will pevent properties that exist in the patch object but not in the source object from being applied to the source object. The implementation is applied exactly in accordance to the comment I made on issue #34 - https://github.com/wbish/jsondiffpatch.net/issues/34 2020-10-25 04:33:33 -06:00
William Bishop a0508be76a
Merge pull request #41 from adam-mccoy/master 
Fix non-compliant RFC 6902
 2020-09-11 09:42:45 -05:00
Adam McCoy 831ec94400 Add JetBrains ignore 2020-09-04 15:08:20 +10:00
Adam McCoy 0f51947b82 Replicate reordering of remove operations from source codebase 2020-09-04 15:08:05 +10:00
Adam McCoy 7f193e8bd8 Refactor and replicate tests from source codebase 2020-09-04 15:06:06 +10:00
Adam McCoy e5b01525c9 Add test verifying array add operations are ordered correctly 2020-06-09 11:51:03 +10:00
William Bishop d1b5a6f9e2
Merge pull request #39 from norvegec/patch-1 
Corrected google-diff-match-patch link in README.md
 2020-05-15 11:39:12 -07:00
Dima Bardakov e191852704
Corrected google-diff-match-patch link in README.md 
Replaced outdated link with actual one.
 2020-04-07 12:09:11 +03:00
William Bishop 50dcca6676
Merge pull request #37 from justinbhopper/master 
Added JsonDeltaFormatter to readme
 2020-04-01 10:30:46 -07:00
Justin Hopper 15f7f580a7 Added JsonDeltaFormatter to readme 2020-04-01 12:21:35 -05:00
William Bishop da7a89f463 Bump version to 2.2 2020-03-30 18:53:55 -07:00
William Bishop dbc19936c5
Merge pull request #36 from justinbhopper/master 
Implementation of JSON RFC 6902
 2020-03-30 18:43:58 -07:00
Justin Hopper 03464117d3 Removed editorconfig from sln 2020-03-30 14:42:57 -05:00
Justin Hopper ac6b5dc792 Moved editorconfig to root 2020-03-30 14:05:27 -05:00
Justin Hopper 4091654196 Updated formatting to match master 2020-03-30 14:03:19 -05:00
Justin Hopper 14ed050e05 Added JsonDeltaFormatter 2020-03-30 13:58:31 -05:00
William Bishop ca0e88aa56
Merge pull request #35 from pmg23/patch-1 
Correct `Options.ArrayDiff` documentation
 2020-02-20 09:18:18 -08:00
Matt Grimwade ad3173410a
Correct `Options.ArrayDiff` documentation 
The doc comment for `Options.ArrayDiff` states that the default setting is `Simple`, but it is actually `Efficient` (line 7).
 2020-02-19 10:26:09 +00:00
khiemnd777 5e2808445a [add] item match serves object hash 2018-10-05 11:49:32 +07:00
William Bishop 6492f22795
Merge pull request #22 from cornz/master 
update json ref
 2018-03-09 11:26:22 -08:00
Cornelius Putzler 25b82d8ee0
update json ref 2018-03-09 17:27:04 +01:00
William Bishop ded89300b5 Remove Build/Tools dir 
No longer needed with new build system
 2018-03-03 19:07:30 -08:00
William Bishop 34cda1ea29
Delete .travis.yml 2018-03-03 18:52:52 -08:00
William Bishop 7ae01b4f64
Update README.md 2018-03-03 18:50:02 -08:00
William Bishop cf7dfce8bb UnitTests csproj tweak 2018-03-03 18:33:15 -08:00
William Bishop dcf4a3e490 Bump Version 2.1.0.0 2018-03-03 13:35:45 -08:00
William Bishop 0c1c7adf9f VS2017 Builds 
Use Visual Studio 2017 format. Conslidate all sln/csproj into single
version.
 2018-03-03 13:29:49 -08:00
William Bishop af11448a77 Fix for #17 
When unpatching, unpatch list should be recreated in reverse order and
also the Patch object needs to have the length and start information.
 2018-03-03 11:58:28 -08:00
William Bishop 8f22916a49 Fix assembly name 2018-03-03 11:47:46 -08:00
William Bishop 2887564bfa
Merge pull request #19 from danielcrenna/master 
add project files for clean builds for .NET Standard
 2018-03-03 10:27:59 -08:00
Daniel Crenna 623fdb4c86 add project files for clean builds for .NET Standard (so it can be used by .NET Core 2.0 / .NET Standard via NuGet without .NET 4.5 project references) 2017-12-08 21:18:03 -05:00
William Bishop a5cb3b66fb Update to v2.0.2.0 2017-11-18 01:16:24 -08:00
William Bishop 9bd9d2f302 Fix #16 
- When unpatching arrays, modifications need to be done before
additions/deletes
- When performing array diffs and nothing matches, we should do object
diffs starting from the front of both arrats, instead of the back.
 2017-11-18 01:13:21 -08:00
William Bishop 901ec82281 Fix build break 2017-06-26 09:48:44 -07:00
William Bishop d0b4916d7d Formatting 2017-06-26 08:51:43 -07:00