Marcelo Glezer
8feebcbf8e
fix for #522
2015-03-18 12:56:12 -03:00
Maximilian Hils
5721e5bd27
require urwid 1.3
2015-03-18 00:05:57 +01:00
Maximilian Hils
29e529a69e
Merge pull request #523 from tekii/fix-client-replay-key
...
fixes crash pressing 'c':client-replay in mitmproxy
2015-03-17 21:43:21 +01:00
Marcelo Glezer
75d4563af0
fixes crash pressing 'c':client-replay in mitmproxy
2015-03-17 16:39:52 -03:00
Maximilian Hils
40c242c3f6
add table sort
2015-03-17 03:05:59 +01:00
Maximilian Hils
4a92c42517
web: smaller changes
2015-03-15 22:05:50 +01:00
Maximilian Hils
3650d73662
Merge remote-tracking branch 'onlywade/master'
...
Conflicts:
libmproxy/console/__init__.py
libmproxy/console/flowlist.py
2015-03-15 14:36:06 +01:00
Maximilian Hils
47091c8db5
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-15 03:09:00 +01:00
Maximilian Hils
7b58fe5142
mitmdump: improve request printing
2015-03-15 03:08:45 +01:00
Maximilian Hils
5b4d54c829
mitmdump: decode flow before printing
2015-03-15 02:53:05 +01:00
Maximilian Hils
7242654d7d
Merge pull request #519 from legendtang/master
...
update package.json during transition period, see #518
2015-03-15 00:03:03 +01:00
Legend Tang
d7ae3bb638
update package.json during transition period, see #518
2015-03-15 02:27:43 +08:00
Maximilian Hils
274e6217de
Merge pull request #517 from mitmproxy/virtualenv-win
...
simplify virtualenv
2015-03-14 03:10:14 +01:00
Maximilian Hils
e9a5a26bf0
./dev: echo what we have done
2015-03-14 03:08:34 +01:00
Maximilian Hils
f309eb3526
Update README.mkd
2015-03-14 02:42:50 +01:00
Maximilian Hils
f815525f18
simplify virtualenv
...
- 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.
2015-03-14 02:33:21 +01:00
Maximilian Hils
9522610866
travis: fix coveralls
2015-03-14 02:20:45 +01:00
Aldo Cortesi
a4f500c82e
Indentation, style, whitespace
2015-03-13 23:14:37 +11:00
Aldo Cortesi
60dce08d54
Remove compatibility shim used to interop with older versions of Urwid
2015-03-13 23:04:07 +11:00
Aldo Cortesi
87a3c71041
Formatting and whitespace
2015-03-13 22:29:21 +11:00
Aldo Cortesi
468cc81c8a
Style & whitespace
2015-03-13 22:07:35 +11:00
Aldo Cortesi
488bcaca6f
Integrate Urwid's MainLoop in console mitmproxy
...
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.
2015-03-13 21:58:22 +11:00
Aldo Cortesi
0d59c2da97
Better error when invalid palette is specified
2015-03-12 22:56:47 +11:00
Aldo Cortesi
04e9260b74
Re-enable OSX binary builds for mitmproxy and mitmweb
2015-03-12 22:52:46 +11:00
Aldo Cortesi
40366fa94e
Virtualenv is the one and only recommended dev environment
...
- 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.
2015-03-12 22:12:15 +11:00
Aldo Cortesi
de3f84934d
Test suite should pass even if example dependencies are not present
2015-03-12 16:57:10 +11:00
Aldo Cortesi
dfc1b39164
Update for latest master of PyInstaller
2015-03-12 13:26:21 +11:00
Maximilian Hils
a8c074054a
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-11 13:11:55 +01:00
Maximilian Hils
937eb839ed
fix sourcemaps
2015-03-11 13:11:41 +01:00
Maximilian Hils
2f40a6fd78
improve source map generation
2015-03-11 11:13:20 +01:00
Maximilian Hils
ec4a6ec4e5
Merge pull request #509 from suyash/mitmweb-add-sourcemap-generation
...
add sourcemap generation for scripts-app-dev task
2015-03-08 21:09:06 +01:00
Wade Catron
803d631f04
Adding a server replay option to ignore host when searching for matching requests
2015-03-08 10:21:57 -07:00
Maximilian Hils
a78eb12e1a
Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'
2015-03-07 01:42:06 +01:00
Maximilian Hils
15a8a93a4e
adjust to changed netlib api
2015-03-07 01:39:01 +01:00
Suyash
e47f9738ec
add sourcemap generation for scripts-app-dev task
2015-03-07 01:47:50 +05:30
Maximilian Hils
353a6ace47
Merge remote-tracking branch 'legend/master'
...
Conflicts:
libmproxy/web/static/app.js
2015-03-06 10:05:12 +01:00
Maximilian Hils
60dc5e0fe3
add mitmweb executable
2015-03-06 10:03:11 +01:00
Maximilian Hils
8c1978b7bf
Merge pull request #507 from legendtang/fix_flowactions
...
fix #506
2015-03-06 10:00:50 +01:00
Legend Tang
de306e6aeb
fix #506
2015-03-06 16:54:18 +08:00
Legend Tang
0b57f851bd
another clean up for #503 #504
2015-03-06 04:03:52 +08:00
Legend Tang
98c0047b4e
clean up for #503 #504
2015-03-06 03:57:38 +08:00
Legend Tang
36db55f662
Replace addListener method with multiple bindings, fix for #503 504
2015-03-06 03:45:58 +08:00
Legend Tang
b903dd4e4a
Revert "revert to custom EventEmitter, workaround for #504 "
...
This reverts commit fa8fc64ce0
2015-03-06 03:29:15 +08:00
Legend Tang
fa8fc64ce0
revert to custom EventEmitter, workaround for #504
...
It's an EventEmitter issue.
2015-03-06 02:51:57 +08:00
Maximilian Hils
300868edff
clean up web builds
2015-03-05 01:52:47 +01:00
Maximilian Hils
4c95c68041
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-04 23:07:04 +01:00
Maximilian Hils
f45f3dd4f1
update docs
2015-03-04 23:06:58 +01:00
Maximilian Hils
8f7ba4ab45
Merge pull request #500 from sunu/master
...
improvement to PR #496
2015-03-04 18:16:19 +01:00
Tarashish Mishra
48023db59e
Minor refactor to PR #496
2015-03-04 22:32:01 +05:30
Marcelo Glezer
b49d573c8b
sorted timing information by timestamp
2015-03-03 18:38:16 -03:00
