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
Maximilian Hils
06fba18106
fix #599
2015-05-31 03:14:14 +02: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
Maximilian Hils
a7d90ccec7
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-02 16:24:47 +02:00
Maximilian Hils
62ff239e41
check in last attempt at contenteditable before retreating to inputs
2015-05-02 16:23:57 +02:00
Aldo Cortesi
e1d3ebb446
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-02 17:20:09 +12:00
Aldo Cortesi
50b7bfaadc
Adapt to new Pathoc API - silence output to stdout.
2015-05-02 16:46:15 +12:00
Maximilian Hils
bb965b8e34
web: try harder to fix editor
2015-05-01 20:45:31 +02:00
Maximilian Hils
c780fc7bdf
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-01 17:25:00 +02:00
Maximilian Hils
3f5ca10c39
mitmweb: add editor
2015-05-01 17:24:44 +02:00
Aldo Cortesi
1c26516b18
pretty_size now lives in netlib.utils
2015-04-30 12:18:01 +12:00
Maximilian Hils
90dff4a8a1
Merge pull request #569 from mike-pt/master
...
Match all freebsd versions and not just freebsd10
2015-04-27 04:41:51 +02:00
Mike C
b942f98f37
+ Use sys.platform.startswith("freebsd") instead of matching just freebsd10.
...
+ This means support for any freebsd version (note that I only tested 11-CURRENT and 9)
2015-04-27 02:31:58 +01:00
Maximilian Hils
ca9dfff4b5
improve docs for win install
...
Adding Python to PATH during installation is useful,
but doesn't help users who have already installed Python.
The Powershell command takes care of the Scripts directory
as well.
2015-04-26 20:09:20 +02:00
Maximilian Hils
b40133a4f3
Merge pull request #555 from elitest/userinstalldocs
...
User Installation Documentation update
2015-04-26 19:39:21 +02:00
Maximilian Hils
1742017752
make code more pythonic
2015-04-26 19:25:59 +02:00
Maximilian Hils
417190daa7
Merge remote-tracking branch 'tunz/crash1'
2015-04-26 18:44:40 +02:00
Maximilian Hils
b5690b8103
remove superfluous set_focus
2015-04-26 18:43:27 +02:00
