Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity
1,601 Commits 1 Branch 67 Tags 50 MiB
52d696df3d
Commit Graph

1601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
52d696df3d fix ssl shutdown in tcp mode, refs #464 2015-02-05 16:46:55 +01:00
Maximilian Hils
310fb18aac fix #464 2015-02-05 15:24:32 +01:00
Maximilian Hils
0ac3227b7b clean up flow reading 2015-02-05 14:44:45 +01:00
Maximilian Hils
19555bb39a Merge remote-tracking branch 'tekii/master' 2015-02-05 14:20:22 +01:00
Maximilian Hils
965cfffa5e fix statusbar initialization 2015-02-05 14:15:26 +01:00
Maximilian Hils
b7ae4b0a4c Merge pull request #447 from tekii/server-replay-missing-args 
missing parameter in start_server_playback call (again)
 2015-02-05 14:11:19 +01:00
Marcelo Glezer
8e57597d22 missing parameter in start_server_playback call 2015-01-13 08:16:00 -03:00
Marcelo Glezer
4f578866fa open flow files using with as max suggested 2015-01-12 14:31:18 -03:00
Marcelo Glezer
c4aeca2764 Merge remote-tracking branch 'base/master' 2015-01-12 12:58:33 -03:00
Maximilian Hils
e089061996 Merge pull request #445 from tekii/hotfix-start-server-playback 
hotfix to mitmproxy missing start_server_playback() parameter added.
 2015-01-12 16:55:21 +01:00
Marcelo Glezer
9553ca0ed4 hotfix to mitmproxy missing start_server_playback() parameter added. backported from PR [#439] 2015-01-12 12:49:23 -03:00
Marcelo Glezer
27950f1972 Merge remote-tracking branch 'base/master' 2015-01-12 10:55:47 -03:00
Maximilian Hils
e18294437c document choice of timeout value, refs #443 2015-01-09 17:17:12 +01:00
Maximilian Hils
40c28b79d1 Merge branch 'master' of github.com:mitmproxy/mitmproxy 2015-01-09 16:40:32 +01:00
Maximilian Hils
8af26bd0b7 fix #443 2015-01-09 16:40:26 +01:00
Maximilian Hils
dcc248797f Merge pull request #442 from nickhs/441 
Error to stdout when loading bad replays from the command line
 2015-01-09 00:39:36 +01:00
Nick HS
3dcba41d6d Error to stdout when loading bad replays from the command line 2015-01-08 13:56:19 -05:00
Maximilian Hils
72690f2864 Merge pull request #440 from michaeljau/patch-2 
Updated inlinescripts.html - changed "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert"
 2015-01-07 22:08:54 +01:00
michaeljau
b39ea74bb6 Update inlinescripts.html 
I updated the certutils.SSLCert reference from "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert".
 2015-01-07 22:20:05 +08:00
Marcelo Glezer
30213d6370 now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter) 2015-01-06 15:49:49 -03:00
Marcelo Glezer
9695377b28 first steps in scenario support 2015-01-05 18:12:38 -03:00
Aldo Cortesi
812ea90dc5 Pin browserify to most recent version that works 
Issue being tracked here:

https://github.com/substack/node-browserify/issues/1044
 2015-01-04 11:42:41 +13:00
Aldo Cortesi
876e5ca683 Ditch old gulpfile 2015-01-03 11:53:24 +13:00
Aldo Cortesi
1959aebc08 Add PEG support to gulpfile 
- Extract conf - all project specific conf outside gulpfile
- Generalize filt.js exports, add required imports
 2015-01-03 11:46:51 +13:00
Aldo Cortesi
f1b040e808 Fix unit tests 2015-01-02 16:12:25 +13:00
Aldo Cortesi
80339aef93 Unit test framework for web client-side code 
- Also make formatSize nicer and test it.

Now there's no excuse! ;)
 2015-01-02 15:29:51 +13:00
Aldo Cortesi
b14b4ace25 Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy 2015-01-02 13:42:56 +13:00
Aldo Cortesi
bb5fb2dbe0 Clean up har_extractor example 
- Fix spacing, line length, unused imports, unusual import idioms
- Prevent it from barfing into our test output
 2015-01-02 13:42:43 +13:00
Aldo Cortesi
1b5f5021dc Consolidate reading flows from file, use in mitmweb. 2015-01-02 13:26:22 +13:00
Maximilian Hils
c152e5da1a we do not support https2http in upstream proxy mode 2015-01-01 22:07:49 +01:00
Aldo Cortesi
4d01e22f26 components/utils.js -> common.js 
Too many utils modules makes things confusing. These are more "common
components" or "common mixins" than utils anyway.
 2015-01-01 20:49:32 +13:00
Aldo Cortesi
866a408120 Make header more compact 
- Remove title bar
- File -> mitmproxy - ultimately our logo can go here
 2015-01-01 20:44:45 +13:00
Aldo Cortesi
4506bafddc Use Facebook's dispatcher 2015-01-01 16:59:58 +13:00
Aldo Cortesi
b09dbbe209 Replace custom EventEmitter with one from browserify 2015-01-01 16:41:45 +13:00
Aldo Cortesi
fa77fba37c Remove unused files 2015-01-01 15:39:24 +13:00
Aldo Cortesi
c9ce5094c8 All files and only files in in js/components are jsx 
So remove the redundant naming
 2015-01-01 15:37:42 +13:00
Aldo Cortesi
67f6f67c48 More browesrification. 2014-12-31 18:14:17 +13:00
Aldo Cortesi
2152d4dd92 More conversions to browserify 2014-12-30 22:12:26 +13:00
Aldo Cortesi
b847faf37f Fix fonts, stylesheets, add much more flexible bootstrap over-rides. 2014-12-30 22:02:55 +13:00
Aldo Cortesi
bc8687deb5 Basic conversion: browserified web app now works. 2014-12-30 21:51:07 +13:00
Aldo Cortesi
d2c7411f06 Start moving to new gulpfile, browerify, etc. 2014-12-30 21:07:00 +13:00
Aldo Cortesi
e9d8586f6b Bump for next dev iteration 2014-12-30 11:26:45 +13:00
Aldo Cortesi
089c5fd948 Bump version 2014-12-30 10:02:45 +13:00
Maximilian Hils
333688b06e Merge branch 'master' of github.com:mitmproxy/mitmproxy 2014-12-29 14:56:47 +01:00
Maximilian Hils
51671b22a0 fix #435 2014-12-29 14:56:35 +01:00
Maximilian Hils
ad973de0b3 fix mitmproxy -w 2014-12-29 14:40:34 +01:00
Aldo Cortesi
55970bf0cc Minor tweaks to release checlist and binary builds 2014-12-29 12:45:38 +13:00
Aldo Cortesi
f78451dbbe Add netlib and libpathod as excludes in MANIFEST.in 
These are commonly symlinked during dev
 2014-12-28 23:28:35 +13:00
Aldo Cortesi
84f57a2832 Adjust how doc rendering uses mitmproxy source location 
We now make sure our imports come from here too, and that we have mod cons like
tilde expansion in the env variable.
 2014-12-28 23:16:50 +13:00
Aldo Cortesi
7f5965225d CHANGELOG 2014-12-28 23:16:44 +13:00