aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* web: fix list update propagationMaximilian Hils2016-06-053-30/+14
* Merge branch 'such-redux'Maximilian Hils2016-06-056-1318/+1409
|\
| * web: modernize flow table columnsMaximilian Hils2016-06-054-1312/+1404
| * web: update reactMaximilian Hils2016-06-051-3/+2
| * web: fix list reducerMaximilian Hils2016-06-051-3/+3
* | Merge pull request #1212 from mitmproxy/such-reduxAldo Cortesi2016-06-0610-703/+434
|\|
| * web: completely move flow state to reduxMaximilian Hils2016-06-0410-703/+434
* | Merge pull request #1215 from redfast00/masterAldo Cortesi2016-06-062-3/+3
|\ \
| * | fix multidict unittestsredfast002016-06-051-2/+2
| * | Now keeps header capitalizationredfast002016-06-051-1/+1
* | | Merge pull request #1211 from cortesi/pathodAldo Cortesi2016-06-0617-654/+76
|\ \ \
| * | | Ditch pathod static assetsAldo Cortesi2016-06-059-215/+0
| * | | Remove last vestiges of noapi and noweb from pathodAldo Cortesi2016-06-055-41/+14
| * | | First-order removal of pathod API and appAldo Cortesi2016-06-056-398/+62
* | | | Use BytesIO instead of StringIOShadab Zafar2016-06-061-2/+2
* | | | Py3: Use functools.total_ordering for better rich comparisonShadab Zafar2016-06-061-0/+2
* | | | Py3: Use rich comparison methods (__eq__, __lt__) instead of __cmp__Shadab Zafar2016-06-061-2/+5
* | | | Py3: Use byte literals for comparisonShadab Zafar2016-06-061-1/+1
* | | | Py3: Use global next() function instead of iterator methodShadab Zafar2016-06-061-7/+7
| |/ / |/| |
* | | Merge pull request #1213 from felixonmars/patch-1Thomas Kriechbaumer2016-06-051-1/+1
|\ \ \
| * | | Allow cryptography 1.4Felix Yan2016-06-051-1/+1
| |/ /
* | | Merge pull request #1206 from Kriechi/improve-http2Thomas Kriechbaumer2016-06-051-15/+43
|\ \ \ | |/ / |/| |
| * | http2: remove custom PUSH_PROMISE headerThomas Kriechbaumer2016-06-041-1/+0
| * | http2: improve GoAway handlingThomas Kriechbaumer2016-06-041-3/+15
| * | http2: respect MAX_CONCURRENT_STREAMS by hold-offThomas Kriechbaumer2016-06-041-11/+28
| |/
* | Fix test that may fail due to binary header dataAldo Cortesi2016-06-054-6/+7
* | Merge pull request #1209 from dufferzafar/pathod-lang-baseThomas Kriechbaumer2016-06-044-8/+8
|\ \
| * | Add test_language_base to tox.iniShadab Zafar2016-06-041-1/+1
| * | Enable Travis for test/pathod/test_language_baseShadab Zafar2016-06-041-2/+2
| * | Py3: Return path unescapedShadab Zafar2016-06-041-1/+1
| * | Py3: Write bytes to fileShadab Zafar2016-06-041-3/+3
| * | Fix function name typoShadab Zafar2016-06-041-1/+1
|/ /
* | Use encode to detect if string is valid ASCIIShadab Zafar2016-06-041-2/+2
* | travis++Thomas Kriechbaumer2016-06-041-2/+2
* | travis++Thomas Kriechbaumer2016-06-041-3/+3
* | add missing pathod files to travisThomas Kriechbaumer2016-06-041-1/+1
* | Merge pull request #1208 from dufferzafar/pathod-lang-writerThomas Kriechbaumer2016-06-042-33/+33
|\ \
| * | Py3: Convert all data to bytes in pathod.language.writer testShadab Zafar2016-06-041-28/+28
| * | Py3: Use global next() instead of iterator methodShadab Zafar2016-06-041-3/+3
| * | Fix Docstring: "inject" can be an action tooShadab Zafar2016-06-041-2/+2
|/ /
* / improve travisThomas Kriechbaumer2016-06-041-2/+3
|/
* web interleave old store and redux flow stateMaximilian Hils2016-06-044-10/+37
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-06-0410-1105/+1191
|\
| * Basic ConsoleMaster tests, based on mastertesterAldo Cortesi2016-06-042-6/+21
| * console/__init__.py -> console/master.pyAldo Cortesi2016-06-044-808/+812
| * Very basic test truss for web.appAldo Cortesi2016-06-041-0/+22
| * Rebase on masterAldo Cortesi2016-06-047-295/+343
* | web: implement update and remove for list and viewMaximilian Hils2016-06-045-36/+184
|/
* web: add flows to redux stateMaximilian Hils2016-06-036-38/+132
* web: add redux list viewsMaximilian Hils2016-06-034-83/+191