Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 2 | -8/+18 | |
| | | | ||||||
| * | | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 5 | -43/+353 | |
| |\ \ | | | | | | | | | Search functionality | |||||
| | * | | now really fix it + test | Pedro Worcel | 2013-12-26 | 2 | -6/+29 | |
| | | | | ||||||
| | * | | fix bug that happens after searching for a non-existant string, and | Pedro Worcel | 2013-12-26 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | later for an existant one. | |||||
| | * | | add docs | Pedro Worcel | 2013-12-26 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | added 'n' functionality, tidy up & testing | Pedro Worcel | 2013-12-26 | 1 | -1/+9 | |
| | | | | ||||||
| | * | | add looping around | Pedro Worcel | 2013-12-26 | 2 | -53/+137 | |
| | | | | ||||||
| | * | | fix failing test | Pedro Worcel | 2013-12-25 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | fix crash | root | 2013-12-25 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 3 | -45/+139 | |
| | | | | | | | | | | | | | | | | documentation. | |||||
| | * | | test passing, UI still not working | root | 2013-12-24 | 4 | -6/+99 | |
| | | | | ||||||
| | * | | add search with / for compatibility with what I'll do. | root | 2013-12-23 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Merge branch 'migrate_from_pil_to_pillow' of ↵ | Aldo Cortesi | 2014-01-05 | 4 | -8/+7 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow Conflicts: requirements.txt | |||||
| | * | | | Update another reference to PIL. | Tomaz Muraus | 2014-01-04 | 1 | -1/+3 | |
| | | | | | ||||||
| | * | | | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 3 | -8/+5 | |
| | | | | | ||||||
| * | | | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 5 | -2/+63 | |
| |\ \ \ \ | | | | | | | | | | | | | Add CSS view which beautifies minified CSS files | |||||
| | * | | | | Fix CSS view prompt, update display mode options. | Tomaz Muraus | 2014-01-04 | 2 | -1/+5 | |
| | | | | | | ||||||
| | * | | | | Provide more sensible serializer options. | Tomaz Muraus | 2014-01-04 | 1 | -0/+5 | |
| | | | | | | ||||||
| | * | | | | Add CSS view which beautifies CSS files if cssutils library is available, | Tomaz Muraus | 2014-01-04 | 4 | -2/+54 | |
| | |/ / / | | | | | | | | | | | | | | | | otherwise it acts as a no-op. | |||||
| * | | | | Introduce file descriptor decorators for Request objects | Aldo Cortesi | 2014-01-05 | 3 | -18/+36 | |
| | | | | | | | | | | | | | | | | | | | | Which lets us enable the apps again, now running from flow.py | |||||
| * | | | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 3 | -20/+20 | |
| | | | | | ||||||
| * | | | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 6 | -133/+137 | |
| | | | | | | | | | | | | | | | | | | | | Disable apps while message passing is improved. | |||||
| * | | | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | fix #195 | Maximilian Hils | 2014-01-03 | 1 | -1/+1 | |
| | |/ / / | | | | | | | | | | | (untested) | |||||
| * / / / | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 6 | -80/+61 | |
| |/ / / | ||||||
* / / / | first steps on tcp proxying | Maximilian Hils | 2014-01-05 | 7 | -359/+180 | |
|/ / / | ||||||
* / / | list mock as requirement (via @droope) | Maximilian Hils | 2013-12-29 | 1 | -0/+1 | |
|/ / | ||||||
* | | ignore web gui specific paths that won't get cleaned up when changing branches | Maximilian Hils | 2013-12-17 | 1 | -0/+2 | |
| | | ||||||
* | | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 9 | -21/+60 | |
|\ \ | |/ |/| | ||||||
| * | Reconnect if the server-connect hook needs the request to decide what to do | Matthias Urlichs | 2013-12-12 | 1 | -4/+12 | |
| | | ||||||
| * | handle a hook changing connection parameters | Matthias Urlichs | 2013-12-12 | 1 | -1/+6 | |
| | | ||||||
| * | serverconnect hook: Set sc.request | Matthias Urlichs | 2013-12-12 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | The serverconnect hook script might need to examine the incoming request in order to set up the server connection. Example use: bind to a distinct source IPv6 address for each client. | |||||
* | | fix script path error in tests | Maximilian Hils | 2013-12-15 | 2 | -2/+14 | |
| | | ||||||
* | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 6 | -9/+128 | |
| | | ||||||
* | | Merge pull request #189 from mitmproxy/refactor_proxyhandler | Aldo Cortesi | 2013-12-13 | 1 | -74/+87 | |
|\ \ | |/ |/| | Refactor ProxyHandler | |||||
| * | add comments | Maximilian Hils | 2013-12-10 | 1 | -1/+18 | |
| | | ||||||
| * | refactor ProxyHandler, remove duplicate code | Maximilian Hils | 2013-12-10 | 1 | -74/+70 | |
| | | ||||||
* | | add content-length 0 if we remove header for chunked encoding, fixes #186 | Maximilian Hils | 2013-12-12 | 2 | -1/+14 | |
| | | ||||||
* | | change certificate path for android, fix #171 | Maximilian Hils | 2013-12-12 | 1 | -2/+2 | |
| | | ||||||
* | | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 3 | -1/+29 | |
| | | ||||||
* | | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 3 | -3/+17 | |
| | | ||||||
* | | Merge pull request #190 from BillinghamJ/patch-1 | Maximilian Hils | 2013-12-11 | 1 | -0/+3 | |
|\ \ | | | | | | | Added small note of file format | |||||
| * | | Added small note of file format | James Billingham | 2013-12-11 | 1 | -0/+3 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-11 | 2 | -2/+2 | |
|\ \ | ||||||
| * \ | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-12-10 | 1 | -26/+19 | |
| |\ \ | ||||||
| * | | | Bump version | Aldo Cortesi | 2013-12-10 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | add documentation on how to use custom certificates | Maximilian Hils | 2013-12-11 | 1 | -0/+14 | |
| |/ / |/| | | ||||||
* | | | ensure binary read on windows | Maximilian Hils | 2013-12-10 | 1 | -1/+2 | |
| |/ |/| | ||||||
* | | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-09 | 1 | -2/+2 | |
|\| | ||||||
| * | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 | |
| | | | | | | | | Further work is required to make scripts work again, though. |