aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* web: remove old event log storeMaximilian Hils2016-06-035-45/+7
* web: implement redux store fetchingMaximilian Hils2016-06-039-73/+360
* fix styleThomas Kriechbaumer2016-06-031-0/+2
* Merge branch 'redux-ducks'Maximilian Hils2016-06-0218-2533/+3953
|\
| * web: fix eventlog height registrationMaximilian Hils2016-06-022-22/+35
| * web: reduxify event log storeMaximilian Hils2016-06-0211-205/+462
| * web: reduxify WebSocketMaximilian Hils2016-06-027-71/+212
| * remove reducers directoryMaximilian Hils2016-06-021-8/+0
| * web: :hatching_chick:Maximilian Hils2016-06-0214-465/+344
| * use object spread operatorMaximilian Hils2016-06-023-4/+7
| * add basic redux architecture, convert eventlog to reduxMaximilian Hils2016-06-029-812/+2258
| * add redux as dependencyMaximilian Hils2016-06-011-0/+2
* | Merge pull request #1190 from mitmproxy/file_menu_save_openMaximilian Hils2016-06-027-1542/+2069
|\ \
| * | final review done, nothing to change -> ready to mergeClemens2016-06-022-1516/+1933
| * | fix dumpfile uploadMaximilian Hils2016-06-023-19/+74
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 04:07:13 +0000