Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-24 00:31:33 +00:00
Code Issues Projects Releases Wiki Activity
5,299 Commits 1 Branch 67 Tags 50 MiB
d12515f84b
Commit Graph

5299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
c4c9527fa0 Merge pull request #1275 from Kriechi/more-py3 
py3++
 2016-06-19 16:50:54 +02:00
Thomas Kriechbaumer
6ad0e3e66e fix default arg 2016-06-19 12:05:10 +02:00
Thomas Kriechbaumer
7bde38dc4a py3++ 2016-06-19 12:00:37 +02:00
Maximilian Hils
5c0161886a Merge pull request #1272 from dwfreed/patch-1 
mitmproxy/models: missed comma in __all__
 2016-06-18 12:20:19 -07:00
Jason
d01e49c6d5 [web] replace SetttingsActions.update with settings.updateSettings 2016-06-19 02:53:15 +08:00
Doug Freed
1f915b7f24 mitmproxy/models: missed comma in __all__ 
Spotted by Landscape (thanks @Kriechi for pointing out the site).  Add a
comma to the last item too, to prevent this from happening in the future
and reduce messing up blame later.
 2016-06-18 14:50:06 -04:00
Jason
9cb5b0af9d Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js
 2016-06-18 14:18:24 +08:00
Jason
6c0511b06f [web] add app ducks 2016-06-18 14:11:47 +08:00
Maximilian Hils
23b976a999 Merge pull request #1270 from mitmproxy/settings 
[web] Settings Ducks 2
 2016-06-17 22:11:16 -07:00
Maximilian Hils
f203936fbf add setInterceptPattern action creator 2016-06-17 21:06:17 -07:00
Maximilian Hils
6a41ea9171 add fetchApi.put shortcut 2016-06-17 21:05:30 -07:00
Maximilian Hils
ce53799c62 simplify settings reducer 2016-06-17 21:03:19 -07:00
Jason
965b27b529 [web] simplify settings 2016-06-17 22:12:32 +08:00
Jason
c82d27b2a2 Merge branch 'master' into settings 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:58:24 +08:00
Jason
e4addd60f1 Merge branch 'master' into websocket 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:54:31 +08:00
Thomas Kriechbaumer
9c6199db9b Merge pull request #1269 from Kriechi/pathod-netlib-http2 
move custom HTTP/2 stack from netlib to pathod
 2016-06-17 15:21:57 +02:00
Thomas Kriechbaumer
eb3ed87100 move custom HTTP/2 stack from netlib to pathod 2016-06-17 15:06:01 +02:00
Maximilian Hils
fcf5dc8728 Merge pull request #1267 from gzzhanghao/components 
[web] Working on components
 2016-06-17 01:53:02 -07:00
Maximilian Hils
78785df16b pathoc: use idna encoding for hostnames 2016-06-16 17:09:52 -07:00
Shadab Zafar
2a0e850615 pathod tests: do not string_escape specs 2016-06-16 17:08:21 -07:00
Shadab Zafar
6782b4ec00 Py3: Store certificate with a byte key 
Had to debug this for hours!
 2016-06-16 17:08:06 -07:00
Shadab Zafar
ea5576238f Py3: Use BytesIO in a pathoc test 2016-06-16 17:08:06 -07:00
Shadab Zafar
aa3d3290ee Py3: Send bytes to get_cert 2016-06-16 17:08:06 -07:00
Shadab Zafar
cd5ef042bb Py3: pathoc should send bytes over wire 2016-06-16 17:08:06 -07:00
Shadab Zafar
500bf18023 Enable Travis for the entire pathod directory :) 2016-06-16 17:08:06 -07:00
Shadab Zafar
f399a5cd29 Py3: Fix tests by using byte literals 2016-06-16 17:08:06 -07:00
Jason
034287edcf [web] clean up 2016-06-17 07:57:06 +08:00
Maximilian Hils
4836f3f12b Merge pull request #1263 from Kriechi/readme 
Update README with information about tox & flake8.
 2016-06-16 16:28:18 -07:00
Jason
16a28eca25 [web] websocket 2016-06-17 07:26:29 +08:00
Jason
7a78970d10 [web] common 2016-06-17 07:07:38 +08:00
Jason
4ce7a9ba77 [web] editor config for line endings 2016-06-17 06:26:46 +08:00
Jason
6ad2f13341 [web] fix settings ducks 2016-06-17 06:01:29 +08:00
Jason
cedac98b70 [web] promot reduce 2016-06-17 05:08:05 +08:00
Jason
7fb0836bfe [web] remove store 2016-06-17 05:08:05 +08:00
Jason
b88937f1e0 [web] eliminate SettingsStore 2016-06-17 05:08:05 +08:00
Jason
99b2b8633d [web] settings store 2016-06-17 05:08:05 +08:00
Jason
f5c597a9e3 [web] Editor & Prompt 2016-06-17 04:38:35 +08:00
Jason
e5bf1e930a [web] FlowView and ContentView 2016-06-17 04:37:57 +08:00
Thomas Kriechbaumer
daa31c0fe0 hide codecov.yml 2016-06-16 18:13:03 +02:00
Maximilian Hils
1fc2db85fa web: fix tests 2016-06-16 03:06:08 -07:00
Thomas Kriechbaumer
1575fd3c9e update README with tox and flake8 info 2016-06-16 10:12:22 +02:00
Maximilian Hils
848e7c6c50 web: use implicit bindActionCreators 2016-06-15 14:32:03 -07:00
Maximilian Hils
c7a891b652 Merge branch 'add_flow_to_options' 2016-06-15 13:40:03 -07:00
Maximilian Hils
94e2929b3f minor fixes 2016-06-15 13:39:56 -07:00
Shadab Zafar
7de5d7b298 Enable Travis for test/pathod/test_pathoc 2016-06-15 09:49:39 +02:00
Shadab Zafar
52fa195204 Unexpected spaces around = 2016-06-15 09:49:39 +02:00
Shadab Zafar
03ce09ca99 Py3: Split on byte newlines in pathod.log 2016-06-15 09:49:39 +02:00
Shadab Zafar
22a94f06e6 Py3: Find Content-Length header by bytes 2016-06-15 09:49:38 +02:00
Shadab Zafar
f83433e674 Py3: pathoc 2016-06-15 09:49:38 +02:00
Shadab Zafar
fa40531a80 Py3: pathod 2016-06-15 09:49:38 +02:00