c68ab3e60c
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-27 02:17:10 +01:00
b8b37fdad6
add simplified connection constructor
2016-02-27 02:17:01 +01:00
679c97ec3e
fix #966
2016-02-27 02:13:26 +01:00
5950587f27
Merge pull request #978 from Kriechi/dev-ci
...
use dev-scripts on CI
2016-02-26 22:06:18 +01:00
168647f7e4
use dev-scripts on CI
2016-02-25 18:01:59 +01:00
7e55a21287
fix #977
2016-02-24 08:29:24 +01:00
02ec4c8207
fix h2 imports
...
fixes #975
2016-02-23 22:10:15 +01:00
1b7b968526
Merge branch 'ParthGanatra-pip-upgrade'
2016-02-23 19:59:59 +01:00
ed5260290f
Update dev.sh
2016-02-23 19:59:30 +01:00
bfbcbfd737
fix coverage collection
2016-02-23 18:07:12 +01:00
dca9139fb2
Merge pull request #967 from dufferzafar/766
...
Fix minor issues with har_extractor
2016-02-22 10:09:28 +13:00
08f44b9fad
Doc tweaks
...
This patch does the following:
- Fixes all warnings in the doc tree
- Adds a modd + devd conf file that renders HTML and treats doc warnings as
errors. This lets you send warning output to your desktop notifier, and gives
livereload similar to the livehtml entry in the Makefile.
- Some small tweaks
Sphinx currently has a bug that causes unknown options to generate a warning:
https://github.com/sphinx-doc/sphinx/issues/2229
This is fixed in stable, but not yet released. You can update Sphinx to the
latest stable like so:
pip install --upgrade https://github.com/sphinx-doc/sphinx/archive/stable.zip
2016-02-21 11:47:17 +13:00
cf3182a6d4
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2016-02-21 10:53:16 +13:00
cf57020038
fix proxy reconnect
2016-02-20 22:08:49 +01:00
985213a6bc
fix tests
2016-02-20 18:55:43 +01:00
6bb27c162f
har_extractor: Replace deprecated stuff with recommended ones
2016-02-20 21:01:59 +05:30
be9329dfd4
har_extractor: Use items() instead of iteritems()
2016-02-20 21:01:27 +05:30
5441683037
First-order conversion of rtool to flat directory structure
2016-02-19 16:43:26 +13:00
e8611acb76
fix #951
2016-02-19 00:46:57 +01:00
614e2ebf29
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-19 00:30:51 +01:00
2bec6a35e2
fix #956
2016-02-19 00:30:37 +01:00
a635e04fbf
console: slightly less hacky hack show http2 warning after first tick
2016-02-19 12:16:55 +13:00
3d477c72d3
Merge pull request #960 from Kriechi/enable-h2
...
enable HTTP/2 by default if available
2016-02-19 11:56:50 +13:00
7d2c7efa57
enable HTTP/2 by default if available
2016-02-18 23:53:53 +01:00
ecb26c3c82
Merge remote-tracking branch 'duffer/pretty-host'
2016-02-18 23:17:02 +01:00
7c6bf7abb3
Merge pull request #964 from mitmproxy/flat-structure
...
Flat structure
2016-02-18 23:10:47 +01:00
d6ab9901d1
Fixup more tests
2016-02-18 21:58:32 +05:30
9dc1224282
Incorporate comments made during review
2016-02-18 20:12:45 +05:30
61cde30ef8
fix .landscape.yml
2016-02-18 13:28:49 +01:00
20352f3453
fix test paths, move coverage config into setup.py
2016-02-18 13:24:17 +01:00
d33d3663ec
combine projects
2016-02-18 13:03:40 +01:00
294774d6f0
move pathod/.sources to root
2016-02-18 12:29:49 +01:00
18b619e164
move mitmproxy/web to root
2016-02-18 12:29:35 +01:00
be02dd105b
Merge pull request #962 from mitmproxy/simpler-issue-template
...
Simplify Issue Template
2016-02-18 11:55:53 +01:00
3cbacf4e0b
remove nonmeaningful contributing section from the readme
2016-02-18 11:42:55 +01:00
6bb39e2eb0
simplify issue template
2016-02-18 11:30:16 +01:00
bf024cd153
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-18 11:27:40 +01:00
f42af90612
move bin into release, update rtool
2016-02-18 11:25:29 +01:00
175109e44e
Use host header values only when the ports match
2016-02-18 07:01:52 +05:30
31ab3a231e
Merge pull request #959 from thiagoarrais/doc-fix
...
Fix misleading documentation for clipboard command
2016-02-18 10:42:07 +13:00
57f3915f76
Merge branch 'Kriechi-h2'
2016-02-18 10:41:08 +13:00
b6e5e50c24
Make fuzzing run again
2016-02-18 10:40:16 +13:00
3343882737
Fix help
...
'P' can also be used on the request screen!
2016-02-17 18:34:21 -03:00
46abde94a4
Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2
2016-02-18 10:22:33 +13:00
c914ad754a
Merge pull request #958 from Kriechi/issue-template
...
add issue template
2016-02-18 10:18:38 +13:00
36e070ee25
Pull bin to the top, move pathod examples to examples dir
2016-02-18 10:15:59 +13:00
2e7b29ce20
Merge remote-tracking branch 'origin/unify'
2016-02-18 10:10:31 +13:00
14f6bcd86e
Adjust release for new repo structure
2016-02-18 09:48:37 +13:00
92597f82ea
Docs and examples to top level
2016-02-18 09:27:08 +13:00
09abd7eb9a
add issue template
2016-02-17 21:10:48 +01:00
Maximilian Hils