Aldo Cortesi
560e44c637
Pull PathEdit out into its own file.
2015-03-20 10:54:57 +13:00
Aldo Cortesi
a3f4296bf1
Explicitly handle keyboard interrupt in mitmproxy
...
Fixes #522
2015-03-20 10:02:34 +13:00
Aldo Cortesi
d7e53e6573
Fix crashes on mouse click when input is being handled
2015-03-20 09:30:29 +13:00
Jim Shaver
998c9c49c4
Merge branch 'master' of github.com:mitmproxy/mitmproxy into ssldocs
2015-03-19 15:58:53 -04:00
Maximilian Hils
97c6d7ed25
onboarding app: serve certs inline to unbreak firefox
2015-03-19 16:29:05 +01:00
Maximilian Hils
51856b7ccd
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-19 16:18:41 +01:00
Maximilian Hils
a2cbfb117b
fix webapp on Windows
...
- the p12 file needs a ".p12" extension. simply naming the file "p12"
isn't sufficient
2015-03-19 16:17:44 +01:00
Aldo Cortesi
b47019293e
Nicer Solarized palettes, using the correct terminal values
2015-03-19 20:49:43 +13:00
Aldo Cortesi
7e9a5e66fe
Reinstate solarized_dark and solarized_light palettes.
2015-03-19 18:42:03 +13:00
Aldo Cortesi
32a674948f
Less painful light heading bar palette
...
lowlight remains painful due to background color restrictions.
2015-03-19 18:29:06 +13:00
Aldo Cortesi
05d1b99043
No output to stdout in the test suite, please.
2015-03-19 18:10:21 +13:00
Aldo Cortesi
1d5fcc6e0e
Revamp palette specification
...
- Split low-color and high-color specifications in palettes.
- Split off light, dark, lowlight and lowdark palettes. Lowlight and lowdark
will be the low-color base for most subsequent palettes.
- Add a small script that makes test pattern requests to pathod.
2015-03-19 18:05:30 +13:00
Aldo Cortesi
b77e511fca
Merge pull request #526 from tekii/fix-522
...
fix for #522
2015-03-19 11:40:53 +13:00
Marcelo Glezer
7c75f4d0db
test/test_console_help.py fixed
2015-03-18 13:49:33 -03:00
Marcelo Glezer
8feebcbf8e
fix for #522
2015-03-18 12:56:12 -03:00
Jim Shaver
36bec7b77e
now actually tracking ssl.html
2015-03-18 00:29:54 -04:00
Jim Shaver
972f612090
Merge remote-tracking branch 'upstream/master'
2015-03-18 00:25:22 -04:00
Jim Shaver
e0e36f5dae
consolidated down all SSL documentation into one document
2015-03-18 00:22:18 -04: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
Jim Shaver
f3dab52a62
Better english
2015-03-17 00:30:18 -04:00
Jim Shaver
968d94d471
Removes all of the platform specific certificate installation instructions.
2015-03-17 00:26:42 -04:00
Maximilian Hils
40c242c3f6
add table sort
2015-03-17 03:05:59 +01:00
Krzysztof Bielicki
953f9aa641
Added tests
2015-03-16 10:23:50 +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
