Thomas Kriechbaumer
fbb2633dd3
replace contrib libraries with pypi dependencies
2015-06-02 10:00:34 +02:00
Aldo Cortesi
0b8cddddf5
console: click-enable tabs
2015-06-02 15:25:58 +12:00
Aldo Cortesi
57a61ae8fd
console: convert add_event to a signal.
2015-06-02 13:45:19 +12:00
Aldo Cortesi
776f0a9669
Minor typo in script error.
2015-06-02 11:58:16 +12:00
Aldo Cortesi
1076c25e5b
console: click in flow list to view flow
2015-06-02 11:27:26 +12:00
Aldo Cortesi
b5bb4106fd
console: mouse scrollwheel throughout.
2015-06-02 11:13:12 +12:00
Aldo Cortesi
62330e4b0f
Enable mouse interaction, add a hint for selecting text.
...
Fixes #597
2015-06-02 11:05:45 +12:00
Maximilian Hils
5e5e73001f
Merge pull request #605 from tekii/fix-604
...
fixes #604 catch method not found for handling pyperclip not found
2015-06-01 18:43:50 +02:00
Marcelo Glezer
14bce0dd12
fixes #604 catch method not found for handling pyperclip not found
2015-06-01 12:06:46 -03:00
Aldo Cortesi
7439e244a6
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-06-01 12:32:03 +12:00
Maximilian Hils
c28cc6fe96
Merge pull request #600 from elitest/print-bracket-fix
...
Print consistency
2015-05-31 15:20:06 +02:00
Jim Shaver
07cc7f6f50
reverting change in libmproxy/contrib/pyparsing.py
2015-05-31 08:09:03 -04:00
Jim Shaver
bd019a7124
revert changes in ncontrib
2015-05-31 07:59:00 -04:00
Jim Shaver
b51363b3ca
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
...
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
2015-05-31 01:21:44 -04:00
Aldo Cortesi
50df036db5
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-31 13:49:21 +12:00
Aldo Cortesi
6c3233ce0c
Appease the code style gods.
2015-05-31 13:16:03 +12:00
Maximilian Hils
06fba18106
fix #599
2015-05-31 03:14:14 +02:00
Aldo Cortesi
13ee54da86
Remove dependency on PyOpenSSL, move version check into netlib.
...
There are a few more functions in the code that accesses PyOpenSSL
directly that should probably also be moved to netlib. Later.
2015-05-31 13:13:12 +12:00
Maximilian Hils
ec92fca8c0
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-31 01:51:31 +02:00
Maximilian Hils
0f8e8ee1ad
add bench tool for windows
2015-05-31 01:51:13 +02:00
Jim Shaver
4fe2c069cc
Fixed print function to be inline with python 3
2015-05-29 23:17:48 -04:00
Aldo Cortesi
a05a70d816
Add coding style check, reformat.
2015-05-30 12:03:28 +12:00
Aldo Cortesi
1a106f4080
Ensure that flow/view state is consistent.
...
Fixes #595 and #592
2015-05-29 11:36:56 +12:00
Aldo Cortesi
99c691def5
Post-release version bump, and checklist addition.
2015-05-26 10:44:52 +12:00
Aldo Cortesi
6d70b790df
release: include resources PyInstaller doesn't record in spec files.
2015-05-25 13:08:32 +12:00
Aldo Cortesi
c098ce8876
docs: widen sidebar
2015-05-25 10:13:01 +12:00
Aldo Cortesi
7fe9f04cce
docs: don't show un-necessary collapse target on mobile
2015-05-24 14:29:53 +12:00
Aldo Cortesi
2135bcec61
docs: styles now live in www.mitproxy.org repo, make images responsive
2015-05-24 14:09:51 +12:00
Aldo Cortesi
0a81265661
docs: adjust for countershape changes
2015-05-24 13:16:49 +12:00
Aldo Cortesi
b91999507e
Move websitelayout to website.
2015-05-23 12:36:52 +12:00
Aldo Cortesi
3161a5be22
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-23 09:44:28 +12:00
Aldo Cortesi
ba070bf947
docs: bootstrap theme + logo
2015-05-22 17:13:58 +12:00
Aldo Cortesi
f816246f4e
doc: fix nav in website mode
2015-05-22 11:21:00 +12:00
Maximilian Hils
98bc983dab
Merge pull request #591 from Kriechi/autoenv-improvements
...
improve autoenv script
2015-05-21 13:28:31 +02:00
Thomas Kriechbaumer
b2f87b9424
improve autoenv script
...
* properly quote DIR variable
(it might contain spaces)
* use builtin string magic instead of `dirname`
2015-05-21 13:15:55 +02:00
Aldo Cortesi
634f2e2c24
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-20 13:13:54 +12:00
Aldo Cortesi
6685c27697
docs: first-pass conversion to bootstrap3
...
Crappy default styling for now.
2015-05-20 13:12:41 +12:00
Maximilian Hils
26923dd0e4
Update CHANGELOG
2015-05-18 11:17:49 +02:00
Aldo Cortesi
a9f6d53562
certificate docs: reorg, wording, tweaks
2015-05-18 12:05:29 +12:00
Aldo Cortesi
b098556e60
Merge branch 'ssldocs' of https://github.com/elitest/mitmproxy into elitest-ssldocs
2015-05-18 11:23:45 +12:00
Aldo Cortesi
14341ffa19
Merge pull request #584 from dlethin/feature/http_1_0
...
Make sure proxy returns the httpversion specified in the request
2015-05-18 11:03:05 +12:00
Aldo Cortesi
48e4fb1af9
Merge pull request #585 from TearsDontFalls/master
...
docs: Single Qoute for ignore pattern with "!"
2015-05-18 11:02:25 +12:00
Aldo Cortesi
33169d610c
Release pep: bump version, changelog, contributors
2015-05-18 10:44:09 +12:00
TearsDontFalls
d88c3a0e95
docs: Single Qoute for ignore pattern with "!"
...
because wouldnt work with default bash settings as its part of history expansion in bash
2015-05-16 11:53:49 +02:00
Doug Lethin
cdff79fd4c
Make sure proxy returns the httpversion specified in the request rather
...
than hardcoding to 1.1.
2015-05-15 22:20:09 -04:00
Maximilian Hils
a8cb8a01a3
docs: add parantheses for ignore parameters.
2015-05-10 20:29:34 +02:00
Maximilian Hils
541a506b5f
Merge pull request #576 from nickraptis/req-ts-start
...
Accurately timestamp start of request
2015-05-08 10:59:03 +02:00
Nick Raptis
202ede3c54
Accurately timestamp start of request
...
When building a request from a stream, try to get an accurate
start timestamp from the Reader. This was already in the code
and also used when building response objects, but was ommited
in commit ddf458b330
2015-05-08 10:58:05 +03:00
Aldo Cortesi
86526eed8d
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-03 10:18:48 +12:00
Aldo Cortesi
fcbfe4b605
Adapt to new literal escaping style in pathod
2015-05-03 10:18:18 +12:00
