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
4,034 Commits 1 Branch 67 Tags 50 MiB
e739517070
Commit Graph

4034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shadab Zafar
1f41719bbc Remove some duplication and make more pythonic har_extractor 2016-03-02 11:39:48 +05:30
Shadab Zafar
27faea2355 Fixup HAR Extractor 2016-03-01 20:20:18 +05:30
Shadab Zafar
1548185a17 Use requests' json parameter 2016-03-01 18:45:05 +05:30
Shadab Zafar
ac25206420 Indent JSON body while exporting it as code 
Fixes #968
 2016-03-01 17:39:32 +05:30
yonder
0077e0f8d9 Add upstream proxy authentication 2016-03-01 17:40:32 +08:00
Maximilian Hils
3de89ab16c web: use es6 modules 2016-02-29 02:57:35 +01:00
Maximilian Hils
9192427d7b web: fix router 2016-02-29 02:16:38 +01:00
Maximilian Hils
cbb068edaa fix up web stuff 2016-02-28 22:35:08 +01:00
Maximilian Hils
ade5078ebd suppress pathoc test timeouts on windows 2016-02-27 14:36:17 +01:00
Maximilian Hils
0faae87acc fix snapshot upload 2016-02-27 14:26:54 +01:00
Maximilian Hils
c68ab3e60c Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-27 02:17:10 +01:00
Maximilian Hils
b8b37fdad6 add simplified connection constructor 2016-02-27 02:17:01 +01:00
Maximilian Hils
679c97ec3e fix #966 2016-02-27 02:13:26 +01:00
Maximilian Hils
5950587f27 Merge pull request #978 from Kriechi/dev-ci 
use dev-scripts on CI
 2016-02-26 22:06:18 +01:00
Thomas Kriechbaumer
168647f7e4 use dev-scripts on CI 2016-02-25 18:01:59 +01:00
Thomas Kriechbaumer
7e55a21287 fix #977 2016-02-24 08:29:24 +01:00
Thomas Kriechbaumer
02ec4c8207 fix h2 imports 
fixes #975
 2016-02-23 22:10:15 +01:00
Thomas Kriechbaumer
1b7b968526 Merge branch 'ParthGanatra-pip-upgrade' 2016-02-23 19:59:59 +01:00
Parth Ganatra
ed5260290f Update dev.sh 2016-02-23 19:59:30 +01:00
Maximilian Hils
bfbcbfd737 fix coverage collection 2016-02-23 18:07:12 +01:00
Aldo Cortesi
dca9139fb2 Merge pull request #967 from dufferzafar/766 
Fix minor issues with har_extractor
 2016-02-22 10:09:28 +13:00
Aldo Cortesi
08f44b9fad Doc tweaks 
This patch does the following:

- Fixes all warnings in the doc tree
- Adds a modd + devd conf file that renders HTML and treats doc warnings as
errors. This lets you send warning output to your desktop notifier, and gives
livereload similar to the livehtml entry in the Makefile.
- Some small tweaks

Sphinx currently has a bug that causes unknown options to generate a warning:

https://github.com/sphinx-doc/sphinx/issues/2229

This is fixed in stable, but not yet released. You can update Sphinx to the
latest stable like so:

pip install --upgrade https://github.com/sphinx-doc/sphinx/archive/stable.zip
 2016-02-21 11:47:17 +13:00
Aldo Cortesi
cf3182a6d4 Merge branch 'master' of github.com:mitmproxy/mitmproxy 2016-02-21 10:53:16 +13:00
Maximilian Hils
cf57020038 fix proxy reconnect 2016-02-20 22:08:49 +01:00
Thomas Kriechbaumer
985213a6bc fix tests 2016-02-20 18:55:43 +01:00
Shadab Zafar
6bb27c162f har_extractor: Replace deprecated stuff with recommended ones 2016-02-20 21:01:59 +05:30
Shadab Zafar
be9329dfd4 har_extractor: Use items() instead of iteritems() 2016-02-20 21:01:27 +05:30
Aldo Cortesi
5441683037 First-order conversion of rtool to flat directory structure 2016-02-19 16:43:26 +13:00
Maximilian Hils
e8611acb76 fix #951 2016-02-19 00:46:57 +01:00
Maximilian Hils
614e2ebf29 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-02-19 00:30:51 +01:00
Maximilian Hils
2bec6a35e2 fix #956 2016-02-19 00:30:37 +01:00
Aldo Cortesi
a635e04fbf console: slightly less hacky hack show http2 warning after first tick 2016-02-19 12:16:55 +13:00
Aldo Cortesi
3d477c72d3 Merge pull request #960 from Kriechi/enable-h2 
enable HTTP/2 by default if available
 2016-02-19 11:56:50 +13:00
Thomas Kriechbaumer
7d2c7efa57 enable HTTP/2 by default if available 2016-02-18 23:53:53 +01:00
Maximilian Hils
ecb26c3c82 Merge remote-tracking branch 'duffer/pretty-host' 2016-02-18 23:17:02 +01:00
Maximilian Hils
7c6bf7abb3 Merge pull request #964 from mitmproxy/flat-structure 
Flat structure
 2016-02-18 23:10:47 +01:00
Shadab Zafar
d6ab9901d1 Fixup more tests 2016-02-18 21:58:32 +05:30
Shadab Zafar
9dc1224282 Incorporate comments made during review 2016-02-18 20:12:45 +05:30
Maximilian Hils
61cde30ef8 fix .landscape.yml 2016-02-18 13:28:49 +01:00
Maximilian Hils
20352f3453 fix test paths, move coverage config into setup.py 2016-02-18 13:24:17 +01:00
Maximilian Hils
d33d3663ec combine projects 2016-02-18 13:03:40 +01:00
Maximilian Hils
294774d6f0 move pathod/.sources to root 2016-02-18 12:29:49 +01:00
Maximilian Hils
18b619e164 move mitmproxy/web to root 2016-02-18 12:29:35 +01:00
Thomas Kriechbaumer
be02dd105b Merge pull request #962 from mitmproxy/simpler-issue-template 
Simplify Issue Template
 2016-02-18 11:55:53 +01:00