aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* web interleave old store and redux flow stateMaximilian Hils2016-06-041-6/+20
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-06-045-1022/+1031
|\
| * Basic ConsoleMaster tests, based on mastertesterAldo Cortesi2016-06-041-5/+8
| * console/__init__.py -> console/master.pyAldo Cortesi2016-06-043-802/+806
| * Rebase on masterAldo Cortesi2016-06-043-219/+224
* | web: implement update and remove for list and viewMaximilian Hils2016-06-042-16/+89
|/
* web: add flows to redux stateMaximilian Hils2016-06-032-32/+92
* web: add redux list viewsMaximilian Hils2016-06-031-76/+118
* web: implement redux store fetchingMaximilian Hils2016-06-032-35/+200
* fix styleThomas Kriechbaumer2016-06-031-0/+2
* Merge branch 'redux-ducks'Maximilian Hils2016-06-024-2336/+3664
|\
| * web: fix eventlog height registrationMaximilian Hils2016-06-021-11/+19
| * web: reduxify event log storeMaximilian Hils2016-06-022-125/+377
| * web: reduxify WebSocketMaximilian Hils2016-06-021-45/+131
| * web: :hatching_chick:Maximilian Hils2016-06-022-285/+206
| * use object spread operatorMaximilian Hils2016-06-021-1/+3
| * add basic redux architecture, convert eventlog to reduxMaximilian Hils2016-06-022-787/+2159
* | Merge pull request #1190 from mitmproxy/file_menu_save_openMaximilian Hils2016-06-023-1524/+2020
|\ \
| * | final review done, nothing to change -> ready to mergeClemens2016-06-022-1516/+1933
| * | fix dumpfile uploadMaximilian Hils2016-06-022-10/+68
| * | web: add fetchApi convenience methodMaximilian Hils2016-06-022-4/+1
| * | change some pr issusesClemens2016-06-021-13/+10
| * | basic file up and download workingClemens2016-06-021-0/+1
| * | added basic file up_download functionality (not finish yet)Clemens2016-06-022-0/+26
* | | Merge pull request #1167 from xntrik/mark_filterAldo Cortesi2016-06-033-0/+44
|\ \ \
| * | | implement a toggle for viewing marked flows only in consoleChristian Frichot2016-05-243-0/+44
* | | | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-031-500/+397
|\ \ \ \ | | |/ / | |/| |
| * | | web: use object spread operatorMaximilian Hils2016-06-021-500/+397
| | |/ | |/|
* / | Fix flow handling for mitmdumpAldo Cortesi2016-06-031-5/+3
|/ /
* | Shift a bunch more string-related functions to strutilsAldo Cortesi2016-06-022-43/+4
* | Utils reorganisation: add netlib.strutilsAldo Cortesi2016-06-023-11/+12
* | Fix non-deterministic test failures in exportAldo Cortesi2016-06-021-10/+11
* | Un-break mitmproxy consoleAldo Cortesi2016-06-011-1/+1
* | Fix test suiteAldo Cortesi2016-06-013-12/+14
* | Fix lint harderAldo Cortesi2016-06-011-9/+9
* | Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-i...Aldo Cortesi2016-06-012-18/+15
|\ \
| * | fix importsMaximilian Hils2016-05-312-16/+13
| * | fix PIL importMaximilian Hils2016-05-311-2/+2
* | | Satisfy lintAldo Cortesi2016-06-015-6/+8
|/ /
* | use module-level imports onlyMaximilian Hils2016-05-3165-487/+598
* | be more strict about module namespacesMaximilian Hils2016-05-313-8/+8
* | http2.frame -> http2.framereaderAldo Cortesi2016-05-311-2/+2
* | Move human-friendly format functions to netlib.human, remove redundant implem...Aldo Cortesi2016-05-316-55/+19
* | utils.multipartdecode -> http.multipart.decodeAldo Cortesi2016-05-312-6/+7
* | Module is part of the name - url.decode, not url.urldecodeAldo Cortesi2016-05-315-5/+5
* | Extract url functions from netlib.utils and move to netlib.http.urlAldo Cortesi2016-05-314-8/+9
* | Start cleaning up netlib.utilsAldo Cortesi2016-05-313-6/+7
* | Extend pseudo-header treatment to :status on responsesAldo Cortesi2016-05-311-2/+6
* | Improve handling of pseudo-headersAldo Cortesi2016-05-311-1/+9
* | tell flake8 that type-annotation imports are okayMaximilian Hils2016-05-302-3/+3