Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 16:17:49 +00:00
Code Issues Projects Releases Wiki Activity
2,143 Commits 1 Branch 67 Tags 50 MiB
515c024448
Commit Graph

2143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Weinstein
84b4ca6a65 match name of automated build base img 2015-06-07 11:06:47 -04:00
Aldo Cortesi
60ee1dd3aa Merge pull request #611 from dweinstein/feature/dockerfiles 
initial add of docker mitmproxy
 2015-06-07 10:12:49 +12:00
David Weinstein
3bd36b58e5 initial add of docker mitmproxy 2015-06-06 00:14:53 -04:00
Aldo Cortesi
bf7b76a997 Merge pull request #610 from tekii/fix-607 
Fix 607
 2015-06-06 11:10:33 +12:00
Marcelo Glezer
1befa9477c fix #607 fix message 2015-06-05 15:33:36 -03:00
Marcelo Glezer
17b34de28d fix #607 decode data before sending it to pyperclip 2015-06-05 15:19:57 -03:00
Aldo Cortesi
783e904b92 Merge pull request #603 from Kriechi/remove-contrib 
replace contrib libraries with pypi dependencies
 2015-06-04 13:30:18 +12:00
Aldo Cortesi
249bb4a2ac Bump version 2015-06-04 11:15:29 +12:00
Aldo Cortesi
946fd375fa Changelog for v0.12.1 2015-06-03 09:33:09 +12:00
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