Commit Graph

4378 Commits

Author SHA1 Message Date
Shadab Zafar
c378fe2199 Remove missing import 2016-03-11 17:57:57 +05:30
Shadab Zafar
9ef1522b5f Update modify_querystring example & add test for it 2016-03-11 17:57:57 +05:30
Shadab Zafar
96df077d54 Add tests for add_header example 2016-03-11 17:57:57 +05:30
Shadab Zafar
a2274f52e4 Add tests for modify_form example 2016-03-11 17:57:57 +05:30
Shadab Zafar
106b296871 Update modify_form example to not use deprecated functions 2016-03-11 17:57:57 +05:30
Thomas Kriechbaumer
e74e212a7a Merge pull request #1022 from dufferzafar/fix-1018
Fix missing cookie import
2016-03-11 13:19:58 +01:00
Shadab Zafar
90587cf998 Fix missing cookie import 2016-03-11 17:36:04 +05:30
Matthew Shao
426f84d930 Add update_focus method in console/__init__.py. 2016-03-11 08:44:51 +08:00
Maximilian Hils
448d28e2cb Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-03-10 21:17:24 +01:00
Maximilian Hils
167bd77683 fix content view example inline script 2016-03-10 21:17:05 +01:00
Maximilian Hils
4a6edd92e6 Merge pull request #1004 from gzzhanghao/vscroll
[web] VirtualScroll and AutoScroll helper
2016-03-10 15:13:24 +01:00
Jason
1c0496e051 [web] VirtualScroll and AutoScroll helper 2016-03-10 21:40:07 +08:00
依云
e9bff5ac56 add resolved IP address in "Details" tab 2016-03-10 21:23:31 +08:00
Maximilian Hils
b413a052f9 Merge pull request #1012 from gzzhanghao/router
[web] eliminate common.Router.getParams
2016-03-09 18:54:34 +01:00
Maximilian Hils
454cca43f0 Merge pull request #1015 from gzzhanghao/props
[web] dont mutate props
2016-03-09 18:53:05 +01:00
Maximilian Hils
aa2bf90b11 Merge pull request #1013 from gzzhanghao/style
[web] Fix label margin in footer
2016-03-09 18:39:51 +01:00
Jason
84f180847d [web] dont mutate props 2016-03-09 13:30:55 +08:00
Maximilian Hils
7fa95aabbb Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-03-08 20:34:37 +01:00
Maximilian Hils
47fa843795 add icon for binaries
This differs from the favicon as that the .ico file stores
the logo in multiple resolutions.
2016-03-08 20:33:48 +01:00
ikoz
0169271bf9 New option: Add server certs to client chain
If enabled, append all server certificates to the certificate chain
served to the client, as extras. Can be used to bypass certain
certificate pinning impementations.
2016-03-08 18:13:36 +00:00
Jason
4522b2b62f [web] fix footer label margin 2016-03-09 00:39:51 +08:00
Jason
df8b21c08f [web] eliminate common.Router.getParams 2016-03-09 00:28:44 +08:00
Matthew Shao
6eb584f766 Fix #1005 2016-03-08 19:42:38 +08:00
Maximilian Hils
ea3742c393 Merge pull request #1009 from gzzhanghao/settings
[web] eliminate SettingsState
2016-03-07 17:58:27 +01:00
Jason
ca9a493a1c [web] uniform code style for Footer component 2016-03-08 00:57:01 +08:00
Jason
0545326dc0 [web] eliminate SettingsState 2016-03-07 18:47:08 +08:00
Maximilian Hils
34d19cf12e Merge pull request #994 from gzzhanghao/common
[web] remove common.ChildFocus
2016-03-05 13:20:43 +01:00
Thomas Kriechbaumer
f59770e949 Merge pull request #969 from dufferzafar/pretty-export
Indent JSON body while exporting it as code
2016-03-04 19:57:22 +01:00
Thomas Kriechbaumer
428da2c4b1 Merge pull request #989 from dufferzafar/har-extractor
Improve HAR Extractor Script
2016-03-04 19:55:52 +01:00
Thomas Kriechbaumer
d7e9dda85c Merge pull request #988 from xhy940801/master
Add upstream proxy authentication
2016-03-04 19:47:31 +01:00
yonder
0e27dfd9c1 Improve test case 2016-03-04 11:12:03 -05:00
Shadab Zafar
d17cd5c6ec Use custom Context object 2016-03-04 03:13:40 +05:30
Shadab Zafar
6a4f1ae7c7 Test har_extractor.response 2016-03-04 03:10:29 +05:30
Shadab Zafar
7108d72705 Fix pprint import 2016-03-04 03:02:49 +05:30
Shadab Zafar
1c80599379 Use default empty page_list 2016-03-04 03:02:33 +05:30
Shadab Zafar
c982f579dd Add basic test for har_extractor 2016-03-04 02:32:01 +05:30
Shadab Zafar
48f1c9afc2 Add a test for json request 2016-03-04 01:06:09 +05:30
Shadab Zafar
9540ede112 Use separators param in json.dumps() to avoid trailing whitespace 2016-03-04 01:05:35 +05:30
Shadab Zafar
01a99f2b25 Handle the case of correct json content-type but malformed body 2016-03-04 01:01:16 +05:30
Shadab Zafar
ec61cfddfd Use json instead of contentviews 2016-03-03 06:44:19 +05:30
yonder
b8ae666c78 Add test for upstream-auth 2016-03-02 12:19:33 -05:00
Maximilian Hils
b48d1fa5b8 Merge pull request #993 from gzzhanghao/tests
[web] Fix eslint warnings about tests
2016-03-02 17:50:59 +01:00
Jason
70cde8ccaa [web] Fix eslint warnings about tests 2016-03-02 23:04:13 +08:00
Jason
1d002182e3 [web] remove common.ChildFocus 2016-03-02 22:37:32 +08:00
Maximilian Hils
fab9dad940 Merge pull request #992 from gzzhanghao/gulp
[web] gulp: log errors from buildScript/bundle
2016-03-02 15:23:50 +01:00
Jason
035f482a44 [web] gulp: log errors from buildScript/bundle 2016-03-02 22:14:28 +08:00
Maximilian Hils
a1c76814e7 Merge pull request #991 from gzzhanghao/flowtable
[web] fix FlowTable.scrollIntoView
2016-03-02 15:11:51 +01:00
Jason
70af4fae46 [web] StoreView.index -> indexOf 2016-03-02 21:55:36 +08:00
Maximilian Hils
8089752cb2 Merge pull request #990 from gzzhanghao/index
[web] fix StoreView.index
2016-03-02 09:54:47 +01:00
Jason
eb19077913 [web] fix StoreView.index 2016-03-02 15:59:56 +08:00