Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #836 from MatthewShao/fix#835 | Maximilian Hils | 2015-11-18 | 1 | -1/+2 | |
|\ \ | ||||||
| * | | fix #835 , can display unicode character correctly | Matthew Shao | 2015-11-16 | 1 | -1/+2 | |
|/ / | ||||||
* | | fix appveyor race conditions in tests | Maximilian Hils | 2015-11-14 | 1 | -6/+4 | |
* | | fix HTTPS Proxy-Authentication, refs #824 | Maximilian Hils | 2015-11-14 | 2 | -1/+7 | |
* | | finalize script reloading :tada: | Maximilian Hils | 2015-11-14 | 6 | -58/+96 | |
* | | structure libmproxy.script | Maximilian Hils | 2015-11-14 | 11 | -223/+293 | |
|\ \ | ||||||
| * | | Decouple libmproxy.script from libmproxy.flow | Matthew Shao | 2015-11-13 | 3 | -18/+25 | |
| * | | Move the observer initalization to the constructor of Script | Matthew Shao | 2015-11-11 | 2 | -9/+9 | |
| * | | Use watchdog to reload scripts automatically. | Matthew Shao | 2015-11-11 | 3 | -0/+27 | |
* | | | minor stylistic fixes | Maximilian Hils | 2015-11-14 | 3 | -17/+16 | |
* | | | Merge pull request #833 from zbuc/contentview_scripts | Maximilian Hils | 2015-11-13 | 7 | -28/+198 | |
|\ \ \ | ||||||
| * | | | Feedback from PR #832 | Chris Czub | 2015-11-13 | 7 | -106/+134 | |
| * | | | Add custom content view plugin support for mitmproxy/mitmdump | Chris Czub | 2015-11-13 | 4 | -1/+111 | |
| * | | | Add new contentviews' content type mappings | Chris Czub | 2015-11-13 | 2 | -0/+11 | |
| * | | | Add "add" ContentView method & test | Chris Czub | 2015-11-13 | 2 | -0/+21 | |
* | | | | Merge pull request #821 from zbuc/protobuf_contentview_test_fix | Maximilian Hils | 2015-11-13 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix failing protobuf contentview test | Chris Czub | 2015-11-06 | 1 | -1/+1 | |
* | | | | be more conservative about dependency versions | Maximilian Hils | 2015-11-13 | 1 | -21/+21 | |
| |/ / |/| | | ||||||
* | | | fix scripteditor bug | Maximilian Hils | 2015-11-10 | 1 | -0/+1 | |
* | | | docs++ | Maximilian Hils | 2015-11-07 | 1 | -13/+13 | |
* | | | Merge pull request #822 from ddworken/master | Maximilian Hils | 2015-11-07 | 1 | -0/+10 | |
|\ \ \ | ||||||
| * | | | Added information on cert pinning (Fixes #689) | David Dworken | 2015-11-06 | 1 | -0/+10 | |
|/ / / | ||||||
* / / | Bump version for next release cycle | Aldo Cortesi | 2015-11-07 | 1 | -1/+1 | |
|/ / | ||||||
* | | Bump version, update CONTRIBUTORS, CHANGELOG | Aldo Cortesi | 2015-11-06 | 3 | -25/+85 | |
* | | Adjust pyinstaller spec paths | Aldo Cortesi | 2015-11-06 | 2 | -2/+2 | |
* | | Catch and ignore thread errors on exit | Aldo Cortesi | 2015-11-06 | 1 | -3/+4 | |
* | | Merge pull request #819 from tekii/hotfix-broken-copy | Maximilian Hils | 2015-11-05 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | fix copy to clipboard command when copying content | Marcelo Glezer | 2015-11-05 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #809 from zbuc/pfctl_errhandling | Maximilian Hils | 2015-11-04 | 1 | -2/+11 | |
|\ \ | |/ |/| | ||||||
| * | PR 809 make code more pythonic | Chris Czub | 2015-11-04 | 1 | -2/+3 | |
| * | Declare & define insufficient_priv | Chris Czub | 2015-10-29 | 1 | -0/+1 | |
| * | Better error handling/reporting for pfctl failures on OS X | Chris Czub | 2015-10-29 | 1 | -2/+9 | |
* | | docs: fix broken graphic | Maximilian Hils | 2015-11-02 | 1 | -0/+0 | |
* | | docs: improve mode flowchart | Maximilian Hils | 2015-11-02 | 2 | -0/+0 | |
* | | improve reverse proxy docs | Maximilian Hils | 2015-11-02 | 1 | -3/+3 | |
* | | try to fix appveyor race conditions in tests | Maximilian Hils | 2015-11-01 | 1 | -16/+4 | |
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-11-01 | 3 | -2/+7 | |
|\ \ | ||||||
| * \ | Merge pull request #810 from gecko655/ctrl_fb | Maximilian Hils | 2015-10-31 | 2 | -0/+5 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Use ctrl+f and ctrl+b to scroll a page | gecko655 | 2015-10-30 | 2 | -0/+5 | |
| |/ | ||||||
| * | Merge pull request #791 from tunz/master | Maximilian Hils | 2015-10-28 | 1 | -2/+2 | |
| |\ | ||||||
| | * | Refresh flowview instead of reopen the same flowview | Choongwoo Han | 2015-10-08 | 1 | -4/+2 | |
| | * | Prevent flowview from creating duplicated windows | Choongwoo Han | 2015-10-04 | 1 | -0/+2 | |
* | | | fix #811 | Maximilian Hils | 2015-11-01 | 1 | -6/+5 | |
|/ / | ||||||
* | | Merge pull request #805 from Badg/patch-1 | Maximilian Hils | 2015-10-23 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Ubuntu install missing libjpeg8-dev, zlib1g-dev | Nick Badger | 2015-10-22 | 1 | -1/+1 | |
| * | | Update ubuntu installation to includ libjpeg | Nick Badger | 2015-10-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-10-22 | 1 | -1/+1 | |
|\ \ | ||||||
| * \ | Merge pull request #801 from ben-lerner/doc_fix | Maximilian Hils | 2015-10-14 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | doc typo fix | Ben Lerner | 2015-10-13 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | fix #800 | Maximilian Hils | 2015-10-22 | 1 | -1/+2 | |
|/ / |