Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Adding a server replay option to ignore host when searching for matching ↵ | Wade Catron | 2015-03-08 | 6 | -28/+65 | |
| | | | | | | | | | | | | requests | |||||
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-15 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #519 from legendtang/master | Maximilian Hils | 2015-03-15 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | update package.json during transition period, see #518 | |||||
| | * | | | update package.json during transition period, see #518 | Legend Tang | 2015-03-15 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | mitmdump: improve request printing | Maximilian Hils | 2015-03-15 | 1 | -9/+14 | |
| | | | | ||||||
* | | | | mitmdump: decode flow before printing | Maximilian Hils | 2015-03-15 | 1 | -48/+40 | |
|/ / / | ||||||
* | | | Merge pull request #517 from mitmproxy/virtualenv-win | Maximilian Hils | 2015-03-14 | 3 | -13/+19 | |
|\ \ \ | | | | | | | | | simplify virtualenv | |||||
| * | | | ./dev: echo what we have done | Maximilian Hils | 2015-03-14 | 2 | -2/+12 | |
| | | | | ||||||
| * | | | Update README.mkd | Maximilian Hils | 2015-03-14 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | simplify virtualenv | Maximilian Hils | 2015-03-14 | 3 | -12/+8 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | - add dev.bat for Windows users - remove ~/.pipcache creation. If that causes issues with PyInstaller, we should use pip --no-cache-dir there or rm -r pip.locations.USER_CACHE_DIR. - remove superfluous pip install calls. | |||||
* | | | travis: fix coveralls | Maximilian Hils | 2015-03-14 | 1 | -0/+2 | |
| | | | ||||||
* | | | Indentation, style, whitespace | Aldo Cortesi | 2015-03-13 | 4 | -40/+128 | |
| | | | ||||||
* | | | Remove compatibility shim used to interop with older versions of Urwid | Aldo Cortesi | 2015-03-13 | 5 | -57/+35 | |
| | | | ||||||
* | | | Formatting and whitespace | Aldo Cortesi | 2015-03-13 | 3 | -21/+46 | |
| | | | ||||||
* | | | Style & whitespace | Aldo Cortesi | 2015-03-13 | 1 | -18/+35 | |
| | | | ||||||
* | | | Integrate Urwid's MainLoop in console mitmproxy | Aldo Cortesi | 2015-03-13 | 1 | -191/+191 | |
| | | | | | | | | | | | | | | | | | | | | | Urwid's method for accumulating multi-character escape codes is now tied up with its main loop, which means we can't avoid it. This commit fixes a range of issues (like escape not working to exit editable fields), and also improves responsiveness. | |||||
* | | | Better error when invalid palette is specified | Aldo Cortesi | 2015-03-12 | 2 | -2/+2 | |
| | | | ||||||
* | | | Re-enable OSX binary builds for mitmproxy and mitmweb | Aldo Cortesi | 2015-03-12 | 1 | -8/+8 | |
| | | | ||||||
* | | | Virtualenv is the one and only recommended dev environment | Aldo Cortesi | 2015-03-12 | 3 | -55/+88 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create a "dev" script to create a virtualenv-based dev environment - Update the docs to remove non-virtualenv install recommendations - Update osx-binaries generation to use virtualenv TODO: - The dev script or an equivalent should be made to work on Windows - We still can't remove the annoying top-level command scripts, because pyinstaller doesn't support entry points. Once it does, they can go. | |||||
* | | | Test suite should pass even if example dependencies are not present | Aldo Cortesi | 2015-03-12 | 1 | -2/+8 | |
| | | | ||||||
* | | | Update for latest master of PyInstaller | Aldo Cortesi | 2015-03-12 | 4 | -15/+11 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-11 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #509 from suyash/mitmweb-add-sourcemap-generation | Maximilian Hils | 2015-03-08 | 2 | -10/+18 | |
| |\ \ | | |/ | |/| | add sourcemap generation for scripts-app-dev task | |||||
* | | | fix sourcemaps | Maximilian Hils | 2015-03-11 | 1 | -11/+35 | |
| | | | ||||||
* | | | improve source map generation | Maximilian Hils | 2015-03-11 | 2 | -470/+554 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation' | Maximilian Hils | 2015-03-07 | 2 | -10/+18 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | add sourcemap generation for scripts-app-dev task | Suyash | 2015-03-07 | 2 | -10/+18 | |
| | | ||||||
* | | adjust to changed netlib api | Maximilian Hils | 2015-03-07 | 1 | -1/+1 | |
|/ | ||||||
* | Merge remote-tracking branch 'legend/master' | Maximilian Hils | 2015-03-06 | 4 | -11/+35 | |
|\ | | | | | | | | | Conflicts: libmproxy/web/static/app.js | |||||
| * | another clean up for #503 #504 | Legend Tang | 2015-03-06 | 3 | -5/+11 | |
| | | ||||||
| * | clean up for #503 #504 | Legend Tang | 2015-03-06 | 2 | -9/+9 | |
| | | ||||||
| * | Replace `addListener` method with multiple bindings, fix for #503 504 | Legend Tang | 2015-03-06 | 2 | -7/+25 | |
| | | ||||||
| * | Revert "revert to custom EventEmitter, workaround for #504" | Legend Tang | 2015-03-06 | 2 | -32/+5 | |
| | | | | | | | | This reverts commit fa8fc64ce0170b029410600af20b25c8160fe5c6. | |||||
| * | revert to custom EventEmitter, workaround for #504 | Legend Tang | 2015-03-06 | 2 | -5/+32 | |
| | | | | | | | | It's an EventEmitter issue. | |||||
* | | add mitmweb executable | Maximilian Hils | 2015-03-06 | 1 | -2/+3 | |
| | | ||||||
* | | Merge pull request #507 from legendtang/fix_flowactions | Maximilian Hils | 2015-03-06 | 3 | -19/+23 | |
|\ \ | |/ |/| | fix #506 | |||||
| * | fix #506 | Legend Tang | 2015-03-06 | 3 | -19/+23 | |
|/ | ||||||
* | clean up web builds | Maximilian Hils | 2015-03-05 | 22 | -8881/+11140 | |
| | ||||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-04 | 3 | -13/+40 | |
|\ | ||||||
| * | Merge pull request #500 from sunu/master | Maximilian Hils | 2015-03-04 | 3 | -13/+40 | |
| |\ | | | | | | | improvement to PR #496 | |||||
| | * | Minor refactor to PR #496 | Tarashish Mishra | 2015-03-04 | 2 | -11/+13 | |
| | | | ||||||
| | * | sorted timing information by timestamp | Marcelo Glezer | 2015-03-03 | 1 | -21/+18 | |
| | | | ||||||
| | * | removed unused parameter | Marcelo Glezer | 2015-03-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | minor refactor | Marcelo Glezer | 2015-03-03 | 1 | -5/+4 | |
| | | | ||||||
| | * | added timing information to FlowDetailView | Marcelo Glezer | 2015-03-03 | 1 | -8/+32 | |
| | | | ||||||
| | * | fixed formatting and added a 'test' (sort of) | Marcelo Glezer | 2015-03-02 | 3 | -18/+14 | |
| | | | ||||||
| | * | #487 added microsecond support to format_timestamp and used in ↵ | Marcelo Glezer | 2015-03-02 | 2 | -10/+19 | |
| | | | | | | | | | | | | FlowDetailView. Still WIP. | |||||
| | * | Merge pull request #2 from mitmproxy/master | Marcelo Glezer | 2015-03-02 | 18 | -51/+220 | |
| | |\ | | |/ | |/| | update to mitmproxy/master | |||||
* | | | update docs | Maximilian Hils | 2015-03-04 | 1 | -2/+6 | |
| | | | ||||||
* | | | Documentation for the client side certificate is added | sentient07 | 2015-03-03 | 1 | -1/+4 | |
|/ / |