Thomas Kriechbaumer
|
5cfc728d2e
|
don't log full tracebacks
|
2016-12-17 18:28:34 +01:00 |
|
Maximilian Hils
|
d4298cd747
|
Merge pull request #1871 from Kriechi/http2-gui
display ALPN information
|
2016-12-17 18:11:36 +01:00 |
|
Thomas Kriechbaumer
|
ffcf060928
|
display ALPN information
|
2016-12-17 17:40:11 +01:00 |
|
Thomas Kriechbaumer
|
07671440ba
|
Merge pull request #1872 from mhils/appveyor
appveyor: don't build installer for PRs
|
2016-12-17 17:25:24 +01:00 |
|
Maximilian Hils
|
377be68cac
|
appveyor: don't build installer for PRs
|
2016-12-17 16:01:44 +01:00 |
|
Thomas Kriechbaumer
|
39a251a988
|
Merge pull request #1870 from Kriechi/http2-timeouts
http2: faster timeouts
|
2016-12-17 10:45:34 +01:00 |
|
Thomas Kriechbaumer
|
3eac72f1a3
|
http2: faster timeouts
|
2016-12-17 10:34:53 +01:00 |
|
Aldo Cortesi
|
fc724b6641
|
Merge pull request #1864 from cortesi/tdocs
Addon test docs, remove stray deprecated events
|
2016-12-17 10:29:27 +13:00 |
|
Aldo Cortesi
|
007aeef770
|
Addon test docs, remove stray deprecated events
Fixes #1572
|
2016-12-17 10:03:35 +13:00 |
|
Aldo Cortesi
|
c4929bbc19
|
Merge pull request #1863 from Kriechi/disable-h2c
disable h2c upgrades
|
2016-12-17 09:19:48 +13:00 |
|
Aldo Cortesi
|
cf15a3c3ef
|
Merge pull request #1862 from mhils/remove-intercept-events
Remove intercept events, update view manually
|
2016-12-17 09:15:11 +13:00 |
|
Thomas Kriechbaumer
|
39a8d4dc22
|
disable h2c upgrades
|
2016-12-16 11:29:07 +01:00 |
|
Maximilian Hils
|
388fa7e716
|
remove intercept events, update view manually
|
2016-12-16 05:43:38 +01:00 |
|
Aldo Cortesi
|
6695ce4624
|
Merge pull request #1861 from cortesi/marking
console: mark view indiciator, fix empty flow list behaviour
|
2016-12-16 17:26:19 +13:00 |
|
Maximilian Hils
|
e769b1fa9a
|
Merge pull request #1860 from cortesi/smokey
Catch occasional protocol errors in regular connect
|
2016-12-16 00:16:34 +01:00 |
|
Aldo Cortesi
|
e387c68b38
|
console: mark view indiciator, fix empty flow list behaviour
Fixes #1782
|
2016-12-16 11:57:45 +13:00 |
|
Aldo Cortesi
|
61e552553c
|
Catch occasional protocol errors in regular connect
Fixes #1843 and #1847
|
2016-12-16 10:54:36 +13:00 |
|
Aldo Cortesi
|
6b5673e849
|
Merge pull request #1845 from mhils/mitmweb-improvements
Mitmweb Improvements
|
2016-12-16 10:04:12 +13:00 |
|
Thomas Kriechbaumer
|
78c78ce651
|
Merge pull request #1857 from mitmproxy/bump-cryptography
update dependencies
|
2016-12-14 19:38:53 +01:00 |
|
Maximilian Hils
|
1d846709c6
|
update dependencies
|
2016-12-14 18:19:49 +01:00 |
|
Maximilian Hils
|
727abdba44
|
Merge pull request #1852 from mhils/simplenamespace
Use types.SimpleNamespace instead of custom NS class
|
2016-12-13 15:06:14 +01:00 |
|
Maximilian Hils
|
e2c6d7ed0f
|
Merge pull request #1851 from mhils/1850
fix #1850
|
2016-12-13 14:41:04 +01:00 |
|
Maximilian Hils
|
44f94c8844
|
use types.SimpleNamespace instead of custom NS class
|
2016-12-13 14:23:21 +01:00 |
|
Maximilian Hils
|
e5b3c8bed3
|
fix #1850
|
2016-12-13 14:12:18 +01:00 |
|
Doug Freed
|
b39380b00f
|
console: respect follow in eventlog
Also make it possible to toggle the option when the eventlog window has focus.
|
2016-12-12 15:41:31 +01:00 |
|
Doug Freed
|
48b6964552
|
console: increase eventlog size limit to 10000
|
2016-12-12 15:41:31 +01:00 |
|
Aldo Cortesi
|
5cf268b012
|
Merge pull request #1842 from cortesi/optsave
Save options to file from console & related work
|
2016-12-12 12:53:26 +13:00 |
|
Aldo Cortesi
|
5e2a80fba1
|
Minor fixes
|
2016-12-12 12:18:33 +13:00 |
|
Maximilian Hils
|
d854e08653
|
[web] various fixes
|
2016-12-12 00:08:29 +01:00 |
|
Aldo Cortesi
|
a4ac5b158f
|
Merge branch 'master' into optsave
|
2016-12-12 11:13:32 +13:00 |
|
Maximilian Hils
|
980a84326b
|
InstallBuilder (#1826)
|
2016-12-11 23:07:47 +01:00 |
|
Aldo Cortesi
|
6dcd620c4a
|
Merge pull request #1838 from mhils/http2-is-difficult
Disable HTTP/2 by default, add explicit on/off switches
|
2016-12-12 09:17:06 +13:00 |
|
Aldo Cortesi
|
a99bf0814c
|
console: clean path prompt handling
- Don't trigger callback if no path is specified
- Expand userdir centrally
- Catch IO errors from callbacks and turn them into status messages
|
2016-12-12 09:13:43 +13:00 |
|
Maximilian Hils
|
a7d7ad2880
|
Merge pull request #1837 from mhils/1809
Fix #1809
|
2016-12-11 21:13:20 +01:00 |
|
Maximilian Hils
|
d1c7b203f0
|
[web] style flow menu
|
2016-12-11 19:59:54 +01:00 |
|
Aldo Cortesi
|
f8032bf85a
|
Replacements and SetHeaders are both defined as text in Options
Bytes don't play well with our config serialization or command-line args.
|
2016-12-12 07:39:59 +13:00 |
|
Aldo Cortesi
|
ca33bea296
|
Extend type checker validate Sequence specs
|
2016-12-12 07:39:59 +13:00 |
|
Aldo Cortesi
|
c5717b17df
|
console: add saving of config file
|
2016-12-12 07:39:59 +13:00 |
|
Maximilian Hils
|
6540aedaab
|
[web] style start menu
|
2016-12-11 18:49:28 +01:00 |
|
Maximilian Hils
|
f16aab963e
|
Merge pull request #1841 from mitmproxy/fix-docs-tests
pin docutils version to fix docs tests
|
2016-12-11 18:15:00 +01:00 |
|
Maximilian Hils
|
00ae4d3f6e
|
fix version sourcing in setup.py
|
2016-12-11 17:50:46 +01:00 |
|
Maximilian Hils
|
8f04225450
|
fix install.rst
|
2016-12-11 17:49:07 +01:00 |
|
Maximilian Hils
|
795e76eee2
|
[web] style options menu
The other menus are WIP.
|
2016-12-11 17:37:11 +01:00 |
|
Maximilian Hils
|
b92980efec
|
[web] show proxy address, add websocket toggle
|
2016-12-11 15:26:49 +01:00 |
|
Maximilian Hils
|
21eeaebc6b
|
pin docutils version to fix docs tests
|
2016-12-11 14:54:12 +01:00 |
|
Maximilian Hils
|
b62b92eabe
|
Merge pull request #1840 from mhils/1829
fix #1829
|
2016-12-11 14:50:20 +01:00 |
|
Maximilian Hils
|
610433f204
|
Merge pull request #1839 from mhils/1830
fix #1830
|
2016-12-11 14:50:13 +01:00 |
|
Maximilian Hils
|
bdba885922
|
fix #1829
|
2016-12-11 13:22:26 +01:00 |
|
Maximilian Hils
|
265ab7bf26
|
fix #1830
|
2016-12-11 13:11:02 +01:00 |
|
Maximilian Hils
|
4023327087
|
Merge pull request #1836 from Kriechi/wipeout-lxml
docs: update installation
|
2016-12-11 13:03:24 +01:00 |
|