Maximilian Hils
|
17f09aa0af
|
unify ipv4/ipv6 address handling
|
2014-01-28 17:28:20 +01:00 |
|
Aldo Cortesi
|
3aa78f9ff3
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
|
2014-01-28 15:20:10 +13:00 |
|
Aldo Cortesi
|
e5d2829364
|
docs: fix spacing of page headers
|
2014-01-28 15:19:53 +13:00 |
|
Maximilian Hils
|
36930a6e1d
|
actually remove test dependencies from requirements.txt
|
2014-01-28 03:17:27 +01:00 |
|
Aldo Cortesi
|
fcb569b7d7
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
|
2014-01-28 15:12:57 +13:00 |
|
Aldo Cortesi
|
0b7a7ffcb1
|
Changelog.
|
2014-01-28 15:12:44 +13:00 |
|
Maximilian Hils
|
125166020b
|
move test requirements out of main requirements.txt
|
2014-01-28 03:09:21 +01:00 |
|
Aldo Cortesi
|
5ce9c2eb65
|
Update contributors.
|
2014-01-28 15:04:20 +13:00 |
|
Aldo Cortesi
|
647a11c900
|
travis: irc notifications
|
2014-01-28 14:52:41 +13:00 |
|
Aldo Cortesi
|
f3369529ab
|
Adjust docs for web app certificate installation.
|
2014-01-28 13:24:11 +13:00 |
|
Aldo Cortesi
|
23ba4eccd8
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
|
2014-01-28 12:55:03 +13:00 |
|
Aldo Cortesi
|
ae87affcbe
|
Nicer layout for cert install options.
|
2014-01-28 09:44:33 +13:00 |
|
Aldo Cortesi
|
784f411273
|
Instructions for adding mitmproxy certificates to the Java trust store.
Fixes #146
|
2014-01-27 14:45:20 +13:00 |
|
Aldo Cortesi
|
2df321e71b
|
Use the mitm.it domain for the app, turn it on by default.
|
2014-01-27 14:37:29 +13:00 |
|
Aldo Cortesi
|
332eb67dfe
|
Android doc update.
|
2014-01-27 14:17:16 +13:00 |
|
Aldo Cortesi
|
f47d89ff4e
|
Revert "Move the doc tree out into its own repo."
This reverts commit 8f88fcedd6.
|
2014-01-27 14:16:23 +13:00 |
|
Aldo Cortesi
|
47c7e37723
|
Serve correct certs from app. Enable Windows and Android icons.
|
2014-01-24 10:46:34 +13:00 |
|
Maximilian Hils
|
5811e79361
|
print warning if netlib and mitmproxy versions are different.
|
2014-01-22 16:21:17 +01:00 |
|
Maximilian Hils
|
94e530ec4f
|
merge master
|
2014-01-22 16:01:31 +01:00 |
|
Aldo Cortesi
|
9044b8b8f5
|
travis: install netlib from git before installing requirements.
|
2014-01-22 13:43:59 +13:00 |
|
Aldo Cortesi
|
faf4338d13
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
Conflicts:
doc-src/certinstall/android.html
|
2014-01-22 13:34:46 +13:00 |
|
Aldo Cortesi
|
8f88fcedd6
|
Move the doc tree out into its own repo.
|
2014-01-22 13:33:02 +13:00 |
|
Maximilian Hils
|
cf094c2fbc
|
Add note on emulated android devices. refs #204
|
2014-01-21 21:56:36 +01:00 |
|
Aldo Cortesi
|
7ddc941116
|
Silence pyflakes
And pick up one bug as a consequence.
|
2014-01-19 18:16:24 +13:00 |
|
Aldo Cortesi
|
cabd848b1e
|
Release test script and checklist.
|
2014-01-19 18:08:59 +13:00 |
|
Aldo Cortesi
|
453075c77a
|
Doc and readme tweaks.
|
2014-01-19 18:08:50 +13:00 |
|
Aldo Cortesi
|
dc59325329
|
Refactor docs to define nav sidebar in only one place.
|
2014-01-19 17:40:26 +13:00 |
|
Aldo Cortesi
|
f431eb5acc
|
Tweak setup.py to allow installs outside source dir
Also fix mitmdump version output
|
2014-01-19 16:06:03 +13:00 |
|
Aldo Cortesi
|
64be9b1a8a
|
Optionally take the mitmproxy path for doc rendering from a env variable.
|
2014-01-19 13:52:45 +13:00 |
|
Aldo Cortesi
|
bd684d4540
|
PyInstaller bug requiring a console import in mitmdump is gone
|
2014-01-19 13:33:15 +13:00 |
|
Aldo Cortesi
|
5782f9393e
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
|
2014-01-19 13:28:18 +13:00 |
|
Aldo Cortesi
|
bf1399fa2b
|
Handle views that don't support search gracefully
This includes all key/value formatted views, e.g. the image view. We
need to support these ultimately, but no time before the next release.
|
2014-01-19 13:23:38 +13:00 |
|
Aldo Cortesi
|
f5f46bf080
|
Re-enable caching on search.
|
2014-01-19 12:43:58 +13:00 |
|
Maximilian Hils
|
1786d77819
|
Add functionality to transparently proxify connections to other HTTPS proxies
|
2014-01-18 22:57:28 +01:00 |
|
Maximilian Hils
|
0b4ad05e02
|
merge master
|
2014-01-18 17:25:59 +01:00 |
|
Maximilian Hils
|
6c24b1d0d2
|
get server reconnect right, fix timestamps
|
2014-01-18 17:15:33 +01:00 |
|
Maximilian Hils
|
862b532fff
|
small refactorings, bugs fixed
|
2014-01-18 15:35:37 +01:00 |
|
Maximilian Hils
|
5acbef236c
|
fix sni bug: respond with the correct certificate
|
2014-01-16 02:33:14 +01:00 |
|
Maximilian Hils
|
779e303dfe
|
fix syntax highlighting for countershape urls by using different quotes
|
2014-01-14 17:58:42 +01:00 |
|
Maximilian Hils
|
92966e7c48
|
add tutorial for transparent proxying, other minor docs improvements
|
2014-01-14 17:47:33 +01:00 |
|
Maximilian Hils
|
621807f697
|
add basic error handling
|
2014-01-13 02:25:58 +01:00 |
|
Aldo Cortesi
|
069aca1df4
|
Deprecate Flow.unload_script in favor of Flow.unload_scripts
In the presence of arguments, unloading a single script is clumsy and
less useful.
|
2014-01-13 14:20:34 +13:00 |
|
Aldo Cortesi
|
4f69eef8f3
|
Extract command parsing and use in script grid editor
|
2014-01-13 14:15:17 +13:00 |
|
Aldo Cortesi
|
42d4a2fae9
|
Script refactoring: move script command parsing into script module.
|
2014-01-12 23:02:29 +13:00 |
|
Aldo Cortesi
|
e5776b8be3
|
Clean up and clarify script API
|
2014-01-12 13:59:32 +13:00 |
|
Aldo Cortesi
|
58e1b3a47f
|
Start refactoring scripts
- Move ScriptContext into script module
- Use mock module instead of hand-rolled mock objects in tests
|
2014-01-12 12:49:19 +13:00 |
|
Maximilian Hils
|
2f63da99c9
|
ignore console test utilities on windows
|
2014-01-10 01:39:16 +01:00 |
|
Maximilian Hils
|
24fc8ff292
|
fix header assembly, other improvements
|
2014-01-10 01:38:28 +01:00 |
|
Maximilian Hils
|
efdb25ef68
|
improve https handling
|
2014-01-09 17:56:42 +01:00 |
|
Maximilian Hils
|
3090267ca4
|
display build status from master branch
|
2014-01-09 17:38:08 +01:00 |
|