Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | web interleave old store and redux flow state | Maximilian Hils | 2016-06-04 | 1 | -6/+20 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-06-04 | 5 | -1022/+1031 |
|\ | |||||
| * | Basic ConsoleMaster tests, based on mastertester | Aldo Cortesi | 2016-06-04 | 1 | -5/+8 |
| * | console/__init__.py -> console/master.py | Aldo Cortesi | 2016-06-04 | 3 | -802/+806 |
| * | Rebase on master | Aldo Cortesi | 2016-06-04 | 3 | -219/+224 |
* | | web: implement update and remove for list and view | Maximilian Hils | 2016-06-04 | 2 | -16/+89 |
|/ | |||||
* | web: add flows to redux state | Maximilian Hils | 2016-06-03 | 2 | -32/+92 |
* | web: add redux list views | Maximilian Hils | 2016-06-03 | 1 | -76/+118 |
* | web: implement redux store fetching | Maximilian Hils | 2016-06-03 | 2 | -35/+200 |
* | fix style | Thomas Kriechbaumer | 2016-06-03 | 1 | -0/+2 |
* | Merge branch 'redux-ducks' | Maximilian Hils | 2016-06-02 | 4 | -2336/+3664 |
|\ | |||||
| * | web: fix eventlog height registration | Maximilian Hils | 2016-06-02 | 1 | -11/+19 |
| * | web: reduxify event log store | Maximilian Hils | 2016-06-02 | 2 | -125/+377 |
| * | web: reduxify WebSocket | Maximilian Hils | 2016-06-02 | 1 | -45/+131 |
| * | web: :hatching_chick: | Maximilian Hils | 2016-06-02 | 2 | -285/+206 |
| * | use object spread operator | Maximilian Hils | 2016-06-02 | 1 | -1/+3 |
| * | add basic redux architecture, convert eventlog to redux | Maximilian Hils | 2016-06-02 | 2 | -787/+2159 |
* | | Merge pull request #1190 from mitmproxy/file_menu_save_open | Maximilian Hils | 2016-06-02 | 3 | -1524/+2020 |
|\ \ | |||||
| * | | final review done, nothing to change -> ready to merge | Clemens | 2016-06-02 | 2 | -1516/+1933 |
| * | | fix dumpfile upload | Maximilian Hils | 2016-06-02 | 2 | -10/+68 |
| * | | web: add fetchApi convenience method | Maximilian Hils | 2016-06-02 | 2 | -4/+1 |
| * | | change some pr issuses | Clemens | 2016-06-02 | 1 | -13/+10 |
| * | | basic file up and download working | Clemens | 2016-06-02 | 1 | -0/+1 |
| * | | added basic file up_download functionality (not finish yet) | Clemens | 2016-06-02 | 2 | -0/+26 |
* | | | Merge pull request #1167 from xntrik/mark_filter | Aldo Cortesi | 2016-06-03 | 3 | -0/+44 |
|\ \ \ | |||||
| * | | | implement a toggle for viewing marked flows only in console | Christian Frichot | 2016-05-24 | 3 | -0/+44 |
* | | | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-06-03 | 1 | -500/+397 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | web: use object spread operator | Maximilian Hils | 2016-06-02 | 1 | -500/+397 |
| | |/ | |/| | |||||
* / | | Fix flow handling for mitmdump | Aldo Cortesi | 2016-06-03 | 1 | -5/+3 |
|/ / | |||||
* | | Shift a bunch more string-related functions to strutils | Aldo Cortesi | 2016-06-02 | 2 | -43/+4 |
* | | Utils reorganisation: add netlib.strutils | Aldo Cortesi | 2016-06-02 | 3 | -11/+12 |
* | | Fix non-deterministic test failures in export | Aldo Cortesi | 2016-06-02 | 1 | -10/+11 |
* | | Un-break mitmproxy console | Aldo Cortesi | 2016-06-01 | 1 | -1/+1 |
* | | Fix test suite | Aldo Cortesi | 2016-06-01 | 3 | -12/+14 |
* | | Fix lint harder | Aldo Cortesi | 2016-06-01 | 1 | -9/+9 |
* | | Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-i... | Aldo Cortesi | 2016-06-01 | 2 | -18/+15 |
|\ \ | |||||
| * | | fix imports | Maximilian Hils | 2016-05-31 | 2 | -16/+13 |
| * | | fix PIL import | Maximilian Hils | 2016-05-31 | 1 | -2/+2 |
* | | | Satisfy lint | Aldo Cortesi | 2016-06-01 | 5 | -6/+8 |
|/ / | |||||
* | | use module-level imports only | Maximilian Hils | 2016-05-31 | 65 | -487/+598 |
* | | be more strict about module namespaces | Maximilian Hils | 2016-05-31 | 3 | -8/+8 |
* | | http2.frame -> http2.framereader | Aldo Cortesi | 2016-05-31 | 1 | -2/+2 |
* | | Move human-friendly format functions to netlib.human, remove redundant implem... | Aldo Cortesi | 2016-05-31 | 6 | -55/+19 |
* | | utils.multipartdecode -> http.multipart.decode | Aldo Cortesi | 2016-05-31 | 2 | -6/+7 |
* | | Module is part of the name - url.decode, not url.urldecode | Aldo Cortesi | 2016-05-31 | 5 | -5/+5 |
* | | Extract url functions from netlib.utils and move to netlib.http.url | Aldo Cortesi | 2016-05-31 | 4 | -8/+9 |
* | | Start cleaning up netlib.utils | Aldo Cortesi | 2016-05-31 | 3 | -6/+7 |
* | | Extend pseudo-header treatment to :status on responses | Aldo Cortesi | 2016-05-31 | 1 | -2/+6 |
* | | Improve handling of pseudo-headers | Aldo Cortesi | 2016-05-31 | 1 | -1/+9 |
* | | tell flake8 that type-annotation imports are okay | Maximilian Hils | 2016-05-30 | 2 | -3/+3 |