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
Aldo Cortesi
d33d125214
Documentation for config files
2014-12-28 22:35:14 +13:00
Aldo Cortesi
e4f510685e
Generalize binary building, add static resources, add spec files for mitmproxy, mitmdump and mitmweb
...
We're now ready to use the same script (more or less) to build Windows
binaries.
2014-12-28 17:39:44 +13:00
Aldo Cortesi
0cc8c44c22
Minor improvements to osx binary build process
...
- Add --shortversion on tools to make packaging easier
- Automate tarfile generation
2014-12-28 15:07:44 +13:00
Aldo Cortesi
ab06c2436b
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-12-27 23:08:56 +13:00
Aldo Cortesi
8a8437470e
Move onboarding app to Tornado
...
Two reasons for this. First, this removes flask and its dependencies, which are
quite sizeable. Second, pyinstaller now barfs on simplejson, which is a Flask
dependency. I just don't have time to fix this upstream, so doing what we
should be doing anyway is a no-brainer.
2014-12-27 23:06:51 +13:00
Maximilian Hils
3e63107e94
web: integrate filter docs
2014-12-26 03:10:24 +01:00
Maximilian Hils
1f454b577f
web: CSP, revert functionality, serve content
2014-12-25 16:10:47 +01:00
Maximilian Hils
7d793ae162
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-25 13:38:34 +01:00
Maximilian Hils
4cfa91a903
web: show mitmproxy version
2014-12-25 02:08:58 +01:00
Maximilian Hils
7ed6f10e35
web: much ui work, such christmas
2014-12-25 02:03:55 +01:00
Maximilian Hils
d0ab553bd0
travis: oftc seems to require channel join
2014-12-24 15:50:23 +01:00
