aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix webapp on WindowsMaximilian Hils2015-03-191-16/+20
| | | | | - the p12 file needs a ".p12" extension. simply naming the file "p12" isn't sufficient
* require urwid 1.3Maximilian Hils2015-03-181-1/+1
|
* Merge pull request #523 from tekii/fix-client-replay-keyMaximilian Hils2015-03-171-1/+1
|\ | | | | fixes crash pressing 'c':client-replay in mitmproxy
| * fixes crash pressing 'c':client-replay in mitmproxyMarcelo Glezer2015-03-171-1/+1
|/
* add table sortMaximilian Hils2015-03-178-109/+395
|
* web: smaller changesMaximilian Hils2015-03-159-106/+65
|
* Merge remote-tracking branch 'onlywade/master'Maximilian Hils2015-03-156-28/+63
|\ | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py
| * Adding a server replay option to ignore host when searching for matching ↵Wade Catron2015-03-086-28/+65
| | | | | | | | requests
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-151-1/+1
|\ \
| * \ Merge pull request #519 from legendtang/masterMaximilian Hils2015-03-151-1/+1
| |\ \ | | | | | | | | update package.json during transition period, see #518
| | * | update package.json during transition period, see #518Legend Tang2015-03-151-1/+1
| |/ /
* | | mitmdump: improve request printingMaximilian Hils2015-03-151-9/+14
| | |
* | | mitmdump: decode flow before printingMaximilian Hils2015-03-151-48/+40
|/ /
* | Merge pull request #517 from mitmproxy/virtualenv-winMaximilian Hils2015-03-143-13/+19
|\ \ | | | | | | simplify virtualenv
| * | ./dev: echo what we have doneMaximilian Hils2015-03-142-2/+12
| | |
| * | Update README.mkdMaximilian Hils2015-03-141-2/+2
| | |
| * | simplify virtualenvMaximilian Hils2015-03-143-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 coverallsMaximilian Hils2015-03-141-0/+2
| |
* | Indentation, style, whitespaceAldo Cortesi2015-03-134-40/+128
| |
* | Remove compatibility shim used to interop with older versions of UrwidAldo Cortesi2015-03-135-57/+35
| |
* | Formatting and whitespaceAldo Cortesi2015-03-133-21/+46
| |
* | Style & whitespaceAldo Cortesi2015-03-131-18/+35
| |
* | Integrate Urwid's MainLoop in console mitmproxyAldo Cortesi2015-03-131-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 specifiedAldo Cortesi2015-03-122-2/+2
| |
* | Re-enable OSX binary builds for mitmproxy and mitmwebAldo Cortesi2015-03-121-8/+8
| |
* | Virtualenv is the one and only recommended dev environmentAldo Cortesi2015-03-123-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 presentAldo Cortesi2015-03-121-2/+8
| |
* | Update for latest master of PyInstallerAldo Cortesi2015-03-124-15/+11
| |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-110-0/+0
|\ \
| * \ Merge pull request #509 from suyash/mitmweb-add-sourcemap-generationMaximilian Hils2015-03-082-10/+18
| |\ \ | | |/ | |/| add sourcemap generation for scripts-app-dev task
* | | fix sourcemapsMaximilian Hils2015-03-111-11/+35
| | |
* | | improve source map generationMaximilian Hils2015-03-112-470/+554
| | |
* | | Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'Maximilian Hils2015-03-072-10/+18
|\ \ \ | |/ / |/| / | |/
| * add sourcemap generation for scripts-app-dev taskSuyash2015-03-072-10/+18
| |
* | adjust to changed netlib apiMaximilian Hils2015-03-071-1/+1
|/
* Merge remote-tracking branch 'legend/master'Maximilian Hils2015-03-064-11/+35
|\ | | | | | | | | Conflicts: libmproxy/web/static/app.js
| * another clean up for #503 #504Legend Tang2015-03-063-5/+11
| |
| * clean up for #503 #504Legend Tang2015-03-062-9/+9
| |
| * Replace `addListener` method with multiple bindings, fix for #503 504Legend Tang2015-03-062-7/+25
| |
| * Revert "revert to custom EventEmitter, workaround for #504"Legend Tang2015-03-062-32/+5
| | | | | | | | This reverts commit fa8fc64ce0170b029410600af20b25c8160fe5c6.
| * revert to custom EventEmitter, workaround for #504Legend Tang2015-03-062-5/+32
| | | | | | | | It's an EventEmitter issue.
* | add mitmweb executableMaximilian Hils2015-03-061-2/+3
| |
* | Merge pull request #507 from legendtang/fix_flowactionsMaximilian Hils2015-03-063-19/+23
|\ \ | |/ |/| fix #506
| * fix #506Legend Tang2015-03-063-19/+23
|/
* clean up web buildsMaximilian Hils2015-03-0522-8881/+11140
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-043-13/+40
|\
| * Merge pull request #500 from sunu/masterMaximilian Hils2015-03-043-13/+40
| |\ | | | | | | improvement to PR #496
| | * Minor refactor to PR #496Tarashish Mishra2015-03-042-11/+13
| | |
| | * sorted timing information by timestampMarcelo Glezer2015-03-031-21/+18
| | |
| | * removed unused parameterMarcelo Glezer2015-03-031-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 12:34:22 +0000