summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of https://github.com/kxepal/python-json-patchStefan Kögl2012-06-224-115/+407
|\
| * Make docs be more sphnix friendly.Alexander Shorin2012-06-211-5/+23
| * Move `make_path` logic to JsonPatch.from_diff class method. Some docstring fi...Alexander Shorin2012-06-211-47/+69
| * Add __bool__ (__nonzero__) and __iter__ methods to JsonPatch.Alexander Shorin2012-06-161-0/+35
| * Let apply_patch to handle patch as JSON-encoded string.Alexander Shorin2012-06-162-2/+16
| * Add arguments description to docstrings.Alexander Shorin2012-06-161-1/+24
| * Revert to original apply_patch() behavior and make f3f3410 changes optional.Alexander Shorin2012-01-052-31/+61
| * Add support of Python 2.4 and 2.5 with simplejson.Alexander Shorin2011-12-252-2/+28
| * Fix compatibility with Python 3.xAlexander Shorin2011-12-251-1/+1
| * Convert JsonPatch instance to JSON string in nicer way.Alexander Shorin2011-12-251-0/+8
| * Add make_patch function to generate JsonPatch by comparing of two documents.Alexander Shorin2011-12-252-0/+77
| * Add docstrings and fix code style in favour to pylint.Alexander Shorin2011-12-251-32/+39
| * Rework tests.Alexander Shorin2011-12-252-99/+86
| * Do not hide any problems.Alexander Shorin2011-12-251-16/+13
| * Reduce patch applying cost.Alexander Shorin2011-12-251-4/+1
| * Bump supported specification versionAlexander Shorin2011-12-252-2/+2
| * Add support for test operationAlexander Shorin2011-12-251-1/+30
| * Add support for move operationAlexander Shorin2011-12-251-0/+22
|/
* Remove unused `location' variableByron Ruth2011-09-171-1/+0
* Add JsonPatchConflict for patch conflictsByron Ruth2011-09-161-7/+11
* compatibility with Python 2.6+ and Python 3.xv0.1Stefan Kögl2011-06-231-2/+3
* add test.py to run doctestsStefan Kögl2011-06-202-0/+44
* add shortcut jsonpatch.apply_patch(doc, patch)Stefan Kögl2011-06-201-0/+12
* initial commitStefan Kögl2011-06-186-0/+294