Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
4,922 Commits 1 Branch 67 Tags 50 MiB
ffcdd02e96
Commit Graph

4922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason
1fc11974a7 [web] update eventlog 2016-06-22 11:12:58 +08:00
Wes Turner
514d75cedd DOC: install.rst: Installation on Fedora, Ubuntu 2016-06-21 19:14:13 -05:00
Thomas Kriechbaumer
7523f41f75 Merge pull request #1283 from dufferzafar/tnetstring3 
tnetstring3
 2016-06-21 20:41:25 +02:00
Shadab Zafar
0adbf21a7f py3++ 2016-06-21 23:55:31 +05:30
Shadab Zafar
0a53550955 mitmproxy.tnetstring -> mitmproxy.contrib.tnetstring 2016-06-21 23:53:59 +05:30
Shadab Zafar
10f4a36a5a Imported tests for tnetstring 
Copied from
a808f6b5ba/tests/test_format.py

Then ran pep8 etc.
 2016-06-21 23:47:36 +05:30
Shadab Zafar
b5d280cab1 Py3: tnetstring 
Copied the initial code from
[tnetstring3](https://raw.githubusercontent.com/carlopires/tnetstring3/master/tnetstring/__init__.py)

Then made some changes, like using the isdigit function, removing
superfluous ord() etc. to make all our tests pass.
 2016-06-21 23:37:28 +05:30
Jason
9a7415a58d [web] store ws object in symbol property 2016-06-22 00:51:45 +08:00
Jason
0cab9ef1fa Merge remote-tracking branch 'origin/master' into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-22 00:49:21 +08:00
Aldo Cortesi
4576dbf8aa Minor wording improvements for the README 2016-06-21 20:52:27 +12:00
Aldo Cortesi
35413b0c3d Merge pull request #1274 from Kriechi/discourse-readme 
add Discourse to README
 2016-06-21 20:49:16 +12:00
Thomas Kriechbaumer
56af469b5a add Discourse to README 2016-06-21 10:03:32 +02:00
Maximilian Hils
65955ee45f add better description 2016-06-20 21:01:24 -07:00
Clemens
37475217bf added tests for ui 2016-06-20 21:00:27 -07:00
Maximilian Hils
44abb4caea Merge pull request #1276 from dufferzafar/console-pathedit 
mitmproxy.console tests - PathEdit
 2016-06-20 20:36:31 -07:00
Maximilian Hils
7ef0e37c74 Merge pull request #1273 from Kriechi/fix-default-arg 
fix default arg
 2016-06-20 14:52:16 -07:00
Maximilian Hils
b1715b4092 Merge pull request #1278 from mitmproxy/add_accept_revert_buttons_to_menu_flow 
added accept and revert to flowmenu
 2016-06-20 14:50:54 -07:00
Shadab Zafar
5b95803be0 py3++ 2016-06-20 21:57:18 +02:00
Shadab Zafar
efeade134a py3++ 2016-06-20 21:39:39 +02:00
Clemens
79834676cb added accept and revert to flowmenu 2016-06-20 10:20:41 +02:00
Maximilian Hils
165deb08fd Merge remote-tracking branch 'jason/settings' 2016-06-19 18:27:12 -07:00
Shadab Zafar
6aeba9777a Add dummy directory to completion 2016-06-20 01:24:27 +05:30
Shadab Zafar
ba13fda10d Add tests for PathEdit 2016-06-20 00:50:41 +05:30
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