| Commit message (Expand) | Author | Age | Files | Lines |
* | fix #459 | Maximilian Hils | 2015-02-05 | 2 | -6/+10 |
* | fix ssl shutdown in tcp mode, refs #464 | Maximilian Hils | 2015-02-05 | 1 | -1/+3 |
* | fix #464 | Maximilian Hils | 2015-02-05 | 2 | -5/+7 |
* | clean up flow reading | Maximilian Hils | 2015-02-05 | 3 | -33/+46 |
* | Merge remote-tracking branch 'tekii/master' | Maximilian Hils | 2015-02-05 | 3 | -10/+14 |
|\ |
|
| * | open flow files using with as max suggested | Marcelo Glezer | 2015-01-12 | 2 | -4/+4 |
| * | Merge remote-tracking branch 'base/master' | Marcelo Glezer | 2015-01-12 | 3 | -6/+18 |
| |\ |
|
| * | | now mitmproxy supports multiple saved flows files too. also fixed server_play... | Marcelo Glezer | 2015-01-06 | 1 | -5/+7 |
| * | | first steps in scenario support | Marcelo Glezer | 2015-01-05 | 2 | -6/+8 |
* | | | fix statusbar initialization | Maximilian Hils | 2015-02-05 | 1 | -0/+2 |
* | | | missing parameter in start_server_playback call | Marcelo Glezer | 2015-01-13 | 1 | -2/+4 |
* | | | hotfix to mitmproxy missing start_server_playback() parameter added. backport... | Marcelo Glezer | 2015-01-12 | 1 | -1/+1 |
| |/
|/| |
|
* | | document choice of timeout value, refs #443 | Maximilian Hils | 2015-01-09 | 1 | -0/+4 |
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-01-09 | 1 | -2/+10 |
|\ \ |
|
| * | | Error to stdout when loading bad replays from the command line | Nick HS | 2015-01-08 | 1 | -2/+10 |
| |/ |
|
* / | fix #443 | Maximilian Hils | 2015-01-09 | 3 | -4/+4 |
|/ |
|
* | Add PEG support to gulpfile | Aldo Cortesi | 2015-01-03 | 2 | -562/+564 |
* | Unit test framework for web client-side code | Aldo Cortesi | 2015-01-02 | 2 | -9/+15 |
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-01-02 | 1 | -10/+18 |
|\ |
|
| * | we do not support https2http in upstream proxy mode | Maximilian Hils | 2015-01-01 | 1 | -10/+18 |
* | | Consolidate reading flows from file, use in mitmweb. | Aldo Cortesi | 2015-01-02 | 5 | -27/+49 |
|/ |
|
* | components/utils.js -> common.js | Aldo Cortesi | 2015-01-01 | 1 | -223/+221 |
* | Make header more compact | Aldo Cortesi | 2015-01-01 | 2 | -9/+3 |
* | Use Facebook's dispatcher | Aldo Cortesi | 2015-01-01 | 1 | -41/+343 |
* | Replace custom EventEmitter with one from browserify | Aldo Cortesi | 2015-01-01 | 1 | -60/+333 |
* | All files and only files in in js/components are jsx | Aldo Cortesi | 2015-01-01 | 1 | -24/+24 |
* | More browesrification. | Aldo Cortesi | 2014-12-31 | 1 | -48/+209 |
* | More conversions to browserify | Aldo Cortesi | 2014-12-30 | 1 | -21/+427 |
* | Fix fonts, stylesheets, add much more flexible bootstrap over-rides. | Aldo Cortesi | 2014-12-30 | 21 | -581/+1524 |
* | Basic conversion: browserified web app now works. | Aldo Cortesi | 2014-12-30 | 7 | -43712/+44741 |
* | Bump for next dev iteration | Aldo Cortesi | 2014-12-30 | 1 | -1/+1 |
* | Bump version | Aldo Cortesi | 2014-12-30 | 1 | -2/+2 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-12-29 | 5 | -23/+80 |
|\ |
|
| * | Documentation for config files | Aldo Cortesi | 2014-12-28 | 1 | -1/+2 |
| * | Minor improvements to osx binary build process | Aldo Cortesi | 2014-12-28 | 1 | -3/+8 |
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2014-12-27 | 4 | -10/+98 |
| |\ |
|
| * | | Move onboarding app to Tornado | Aldo Cortesi | 2014-12-27 | 4 | -20/+71 |
* | | | fix #435 | Maximilian Hils | 2014-12-29 | 1 | -0/+4 |
* | | | fix mitmproxy -w | Maximilian Hils | 2014-12-29 | 2 | -7/+7 |
| |/
|/| |
|
* | | web: integrate filter docs | Maximilian Hils | 2014-12-26 | 4 | -10/+98 |
|/ |
|
* | web: CSP, revert functionality, serve content | Maximilian Hils | 2014-12-25 | 6 | -89/+114 |
* | web: show mitmproxy version | Maximilian Hils | 2014-12-25 | 1 | -0/+2 |
* | web: much ui work, such christmas | Maximilian Hils | 2014-12-25 | 4 | -57/+165 |
* | bump version, update release checklist | Maximilian Hils | 2014-12-24 | 1 | -1/+1 |
* | web: duplicate, delete, replay flows | Maximilian Hils | 2014-12-24 | 5 | -132/+225 |
* | web: move eventlog state out of settings | Maximilian Hils | 2014-12-23 | 3 | -16/+47 |
* | fix gzipped body edit | Maximilian Hils | 2014-12-23 | 1 | -15/+20 |
* | web: intercept feature | Maximilian Hils | 2014-12-23 | 11 | -108/+206 |
* | web: squash bugs | Maximilian Hils | 2014-12-23 | 1 | -16/+12 |
* | web: simpler filter ui | Maximilian Hils | 2014-12-23 | 2 | -87/+43 |