summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Expect path/from attributes also as JsonPoiner instances (#60)jsonptrStefan Kögl2017-12-032-3/+34
* Remove broken badges from READMEStefan Kögl2017-11-251-1/+1
* Update ext_tests.py for current versions of coverageStefan Kögl2017-11-251-9/+10
* Add test case for issue reported in #41Stefan Kögl2017-11-251-0/+10
* Add test case for issue reported in #74Stefan Kögl2017-11-251-0/+11
* Bump version to 1.20v1.20Stefan Kögl2017-11-251-1/+1
* Disable tests for Python 2.6Stefan Kögl2017-11-251-1/+0
* Deploy to PyPI from Travis-CIStefan Kögl2017-11-251-0/+14
* Reformat .travis.ymlStefan Kögl2017-11-251-15/+15
* Merge branch 'jsondiff'Stefan Kögl2017-11-253-290/+318
|\
| * Merge branch 'master' into jsondiffStefan Kögl2017-11-254-30/+6
| |\
| * | Show coverage report after testsjsondiffStefan Kögl2017-10-291-1/+2
| * | Fix unicode dict keys in Python 2Stefan Kögl2017-09-101-0/+2
| * | Improve optimizationsStefan Kögl2017-09-102-6/+22
| * | Code styleStefan Kögl2017-09-101-13/+30
| * | Rename old{path,key} to from_{path,key}Stefan Kögl2017-09-101-18/+18
| * | Simplify compatibility codeStefan Kögl2017-09-101-18/+7
| * | Redefine _compare_info class as DiffBuilderStefan Kögl2017-09-101-98/+98
| * | Break long linesStefan Kögl2017-09-101-6/+30
| * | Merge _op_base classes into PatchOperation classesStefan Kögl2017-09-101-112/+113
| * | Re-enable previously disabled optimization testsStefan Kögl2017-09-101-6/+2
| * | Remove re-creation of no-optimization patchStefan Kögl2017-09-101-12/+1
| * | Drop in patch creation from jsondiffStefan Kögl2017-09-101-263/+256
| * | Remove support for Python 3.2Stefan Kögl2017-09-102-2/+0
* | | Merge branch 'jsonload-no-override'Stefan Kögl2017-11-251-2/+2
|\ \ \ | |_|/ |/| |
| * | Avoid overriding json.load (fixes #37)jsonload-no-overrideStefan Kögl2017-10-211-2/+2
|/ /
* | Update supported versions in docsStefan Kögl2017-10-211-3/+3
* | Remove support for Python 2.6Stefan Kögl2017-10-212-25/+3
* | Remove support for Python 3.2Stefan Kögl2017-10-212-4/+0
|/
* Remove trailing whitespaceStefan Kögl2017-09-102-3/+3
* Merge pull request #65 from thunderstruck47/masterStefan Kögl2017-09-102-3/+14
|\
| * added a test case for issue #30thunderstruck472017-07-261-1/+9
| * fixing array diff bug (issue #30)thunderstruck472017-07-261-2/+5
* | Merge branch 'list_tests'Stefan Kögl2017-09-031-7/+52
|\ \ | |/ |/|
| * Disable tests for disabled optimizationsStefan Kögl2017-09-031-2/+6
| * Merge branch 'list_tests@v1.13' into list_testsStefan Kögl2017-09-031-7/+48
| |\ |/ /
| * Merge branch 'list_tests@v1.9' into list_tests@v1.13selurvedu2016-04-081-7/+48
| |\
| | * Move list-related testcases into separate classselurvedu2016-04-081-0/+4
| | * Update tests from ea80865 to run on Python 3.2selurvedu2016-04-081-8/+8
| | * added error-prone cases to default testsStas Erema2016-04-081-0/+32
| | * Allow longer patches in test_use_move_...selurvedu2016-04-081-2/+3
| | * Extend tests that check list patchingselurvedu2016-04-081-7/+11
* | | Merge commit '1fc5e2022ff2c5796bd28af56646b135ede4ee71'Stefan Kögl2017-07-171-1/+1
|\ \ \
| * | | Bump version to 1.16v1.16Stefan Kögl2017-06-151-1/+1
* | | | Avoid double work (#62)Tristan Seligmann2017-07-091-1/+1
|/ / /
* | | Merge branch 'mrhadenough-fix_optimization_bugs'Stefan Kögl2017-06-153-29/+520
|\ \ \
| * | | don't apply patch optimization when it's incorrectKostya2017-04-272-6/+26
| * | | Fix: python 3.2 testskostya2017-03-081-1/+1
| * | | Fix: optimization bugs #55, #54, add more testskostya2017-03-083-24/+495
|/ / /
* | | bump version to 1.15v1.15Stefan Kögl2017-01-121-1/+1
View Lorry Controller Status