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
8,247 Commits 1 Branch 67 Tags 50 MiB
2177eb9e35
Commit Graph

8247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
1da4358706 [requires.io] dependency update on master branch (#3154) 2018-05-24 23:48:45 +02:00
Aldo Cortesi
f55293611e cibuild: minor - organize env class to make things easier to find 2018-05-25 09:07:18 +12:00
Aldo Cortesi
66d612eeca
Merge pull request #3152 from mitmproxy/cibuild 
Tame cibuild (somewhat)
 2018-05-25 08:29:24 +12:00
Aldo Cortesi
fdf0d9974e cibuild: more accurate PR test, better dump output 2018-05-24 22:58:33 +12:00
Aldo Cortesi
e9b19dba8a cibuild: fix docker upload condition, expand tests 2018-05-24 22:32:31 +12:00
Aldo Cortesi
c91b511bc7 cibuild: extract upload conditions 2018-05-24 22:18:01 +12:00
Aldo Cortesi
0afff3a952 cibuild: add docker tag calculation to environ 2018-05-24 21:59:45 +12:00
Aldo Cortesi
bae4a3393f release: include release directory in coverage 
With lots of exclusions for now
 2018-05-24 19:03:15 +12:00
Aldo Cortesi
8fceaca6b8 cibuild: Consolidate build environment and add tests 2018-05-24 11:06:43 +12:00
Maximilian Hils
f910f361a0
update appveyor badge 2018-05-22 11:15:24 +02:00
Maximilian Hils
e683fb68c9
appveyor: remove slack webhook 2018-05-22 11:13:19 +02:00
Aldo Cortesi
7aaf4953b4
Merge pull request #3138 from Kriechi/docker 
add docker to the main repository
 2018-05-22 09:18:20 +12:00
Thomas Kriechbaumer
46960fa080 add docker to the main repository 2018-05-19 12:38:44 +02:00
Maximilian Hils
967b314cdc
Merge pull request #3136 from Mrigank11/patch-2 
[WEB] Make "Edit Flow" button fixed
 2018-05-18 18:00:20 +02:00
Aldo Cortesi
eaca8fdaf7
Merge pull request #3137 from cortesi/races 
track down racy tests
 2018-05-18 10:09:20 +12:00
Aldo Cortesi
064929b559 clientreplay: fix racy tests harder 2018-05-18 09:51:56 +12:00
Aldo Cortesi
aae06c96dd
Merge pull request #3131 from cortesi/postrelease 
Post-release updates
 2018-05-18 08:33:17 +12:00
Aldo Cortesi
e1de592e46 Release cleanups 
- rtool suck back in, the bastard! Delete it.
- Ditch CONTRRIBUTORS, saving a step. I added this before Github had a contributors
page, which is good enough:
    https://github.com/mitmproxy/mitmproxy/graphs/contributors
- Remove some cruft from CI that we no longer use.
 2018-05-18 08:09:42 +12:00
Mrigank Krishan
27449d9c8b
Update flowview.less 2018-05-17 23:04:21 +05:30
Thomas Kriechbaumer
2bbfcfae92 improve release workflow 2018-05-17 18:28:43 +02:00
Thomas Kriechbaumer
762aa287cc Update README.md 2018-05-17 18:28:43 +02:00
Aldo Cortesi
052b378ea6 Post-release updates 
- Update release docs
- Bump version
 2018-05-17 18:28:43 +02:00
Thomas Kriechbaumer
93b90a94ed Revert "Remove MANIFEST.in" 
This reverts commit 9a53525b83.
 2018-05-17 09:37:27 +02:00
Aldo Cortesi
764fce9f1d
Merge pull request #3130 from cortesi/cl 
CHANGELOG
 2018-05-17 10:02:16 +12:00
Aldo Cortesi
cf14409da9 CHANGELOG 2018-05-17 09:58:17 +12:00
Aldo Cortesi
48d7a944bc
Merge pull request #3119 from Kriechi/inject-websocket-message 
websocket: inject messages via flow
 2018-05-17 08:35:40 +12:00
Aldo Cortesi
df9240f260
Merge pull request #3128 from cortesi/pdocs 
docs - installation and minor updates
 2018-05-17 08:03:24 +12:00
Thomas Kriechbaumer
976ab0c466 websocket: inject messages via flow 2018-05-16 21:50:15 +02:00
Maximilian Hils
615d606da9
docs: minor improvements to Windows installation 2018-05-16 15:35:37 +02:00
Aldo Cortesi
dc2ac88871 docs: complete, informative documentation on our SOCKS5 mode 2018-05-16 10:15:54 +12:00
Aldo Cortesi
17dd7e2bd6 docs: installation, WSL 2018-05-16 10:07:03 +12:00
Thomas Kriechbaumer
a38497ac36
Merge pull request #3121 from Kriechi/py37-dev 
test on Python 3.7-dev
 2018-05-15 10:43:44 +02:00
Aldo Cortesi
b87a1a650c
Merge pull request #3125 from cortesi/ndocs 
docs: tweaks and document keys.yaml
 2018-05-15 12:01:10 +12:00
Aldo Cortesi
56010ebcb7 docs: clarify binary packaage admonition 2018-05-15 10:46:30 +12:00
Aldo Cortesi
2db223decb docs: console key binding docs and example 2018-05-15 10:34:55 +12:00
Aldo Cortesi
fe4c371001 docs: split out tool documentation 2018-05-15 10:07:09 +12:00
Thomas Kriechbaumer
9979be6487 fix py36/37 escaping issues 
closes #3122

https://bugs.python.org/issue16285
https://bugs.python.org/issue12910
21024f0662
 2018-05-14 10:41:46 +02:00
Aldo Cortesi
3ec3e4bcc9
Merge pull request #3124 from joaquingx/master 
Fixing Typos
 2018-05-14 16:11:02 +12:00
Joaquin
f4a6153f2e Fixing Typos 2018-05-13 17:31:20 -05:00
Thomas Kriechbaumer
6478523913 test on Python 3.7-dev 2018-05-13 09:56:32 +02:00
Aldo Cortesi
7fde02ac90
Merge pull request #3117 from cortesi/morefixes 
More misc fixes
 2018-05-12 14:41:23 +12:00
Aldo Cortesi
58ff51da10 command: handle string without terminal escaped char 
Fixes #2810
 2018-05-12 14:02:20 +12:00
Aldo Cortesi
449b8b383d controller: add mysteriously missing comment portion 
Thanks to @tran-tien-dat
 2018-05-12 13:52:15 +12:00
Aldo Cortesi
4b4d97412b clientreplay: don't restrict outbound replay address to listen host 
Fixes #2647
 2018-05-12 13:38:15 +12:00
Aldo Cortesi
2db0245233
Merge pull request #3116 from cortesi/fixes 
Misc fixes
 2018-05-12 13:32:57 +12:00
Aldo Cortesi
94428b2ffd script: tweak explicit command invocation 2018-05-12 13:14:26 +12:00
Aldo Cortesi
33eba29d1e tcp: handle EINVAL from closed connections 
Fixes #2771
 2018-05-12 12:36:31 +12:00
Aldo Cortesi
88fe26997c script: revamp ephemeral script running 
Fixes 2838
 2018-05-12 12:35:24 +12:00
Aldo Cortesi
45c435592f
Merge pull request #3115 from cortesi/cmds 
commands fixes and improvements
 2018-05-12 11:46:28 +12:00
Aldo Cortesi
260f729092 Commit taken messages on kill 
Fixes 2879
 2018-05-12 11:39:44 +12:00