Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added copy functionality to flowview too | Marcelo Glezer | 2015-01-14 | 1 | -1/+23 |
| | |||||
* | removed invalid comment and unneeded safe text | Marcelo Glezer | 2015-01-14 | 2 | -5/+0 |
| | |||||
* | now content and header are working and exception for binary files are ↵ | Marcelo Glezer | 2015-01-14 | 2 | -11/+16 |
| | | | | handled correctly | ||||
* | wip - content copy is working, header representation is not | Marcelo Glezer | 2015-01-14 | 2 | -0/+31 |
| | |||||
* | added pyperclip dependency | Marcelo Glezer | 2015-01-13 | 1 | -1/+2 |
| | |||||
* | Merge pull request #445 from tekii/hotfix-start-server-playback | Maximilian Hils | 2015-01-12 | 1 | -1/+1 |
|\ | | | | | hotfix to mitmproxy missing start_server_playback() parameter added. | ||||
| * | hotfix to mitmproxy missing start_server_playback() parameter added. ↵ | Marcelo Glezer | 2015-01-12 | 1 | -1/+1 |
|/ | | | | backported from PR [#439] | ||||
* | document choice of timeout value, refs #443 | Maximilian Hils | 2015-01-09 | 1 | -0/+4 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-01-09 | 2 | -4/+12 |
|\ | |||||
| * | Merge pull request #442 from nickhs/441 | Maximilian Hils | 2015-01-09 | 1 | -2/+10 |
| |\ | | | | | | | Error to stdout when loading bad replays from the command line | ||||
| | * | Error to stdout when loading bad replays from the command line | Nick HS | 2015-01-08 | 1 | -2/+10 |
| |/ | |||||
| * | Merge pull request #440 from michaeljau/patch-2 | Maximilian Hils | 2015-01-07 | 1 | -2/+2 |
| |\ | | | | | | | Updated inlinescripts.html - changed "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert" | ||||
| | * | Update inlinescripts.html | michaeljau | 2015-01-07 | 1 | -2/+2 |
| |/ | | | | | I updated the certutils.SSLCert reference from "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert". | ||||
* / | fix #443 | Maximilian Hils | 2015-01-09 | 4 | -4/+28 |
|/ | |||||
* | Pin browserify to most recent version that works | Aldo Cortesi | 2015-01-04 | 1 | -1/+1 |
| | | | | | | Issue being tracked here: https://github.com/substack/node-browserify/issues/1044 | ||||
* | Ditch old gulpfile | Aldo Cortesi | 2015-01-03 | 2 | -180/+0 |
| | |||||
* | Add PEG support to gulpfile | Aldo Cortesi | 2015-01-03 | 8 | -646/+670 |
| | | | | | - Extract conf - all project specific conf outside gulpfile - Generalize filt.js exports, add required imports | ||||
* | Fix unit tests | Aldo Cortesi | 2015-01-02 | 1 | -2/+2 |
| | |||||
* | Unit test framework for web client-side code | Aldo Cortesi | 2015-01-02 | 6 | -55/+91 |
| | | | | | | - Also make formatSize nicer and test it. Now there's no excuse! ;) | ||||
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-01-02 | 2 | -24/+18 |
|\ | |||||
| * | we do not support https2http in upstream proxy mode | Maximilian Hils | 2015-01-01 | 2 | -24/+18 |
| | | |||||
* | | Clean up har_extractor example | Aldo Cortesi | 2015-01-02 | 1 | -54/+76 |
| | | | | | | | | | | - Fix spacing, line length, unused imports, unusual import idioms - Prevent it from barfing into our test output | ||||
* | | Consolidate reading flows from file, use in mitmweb. | Aldo Cortesi | 2015-01-02 | 6 | -30/+60 |
|/ | |||||
* | components/utils.js -> common.js | Aldo Cortesi | 2015-01-01 | 8 | -241/+237 |
| | | | | | Too many utils modules makes things confusing. These are more "common components" or "common mixins" than utils anyway. | ||||
* | Make header more compact | Aldo Cortesi | 2015-01-01 | 4 | -20/+5 |
| | | | | | - Remove title bar - File -> mitmproxy - ultimately our logo can go here | ||||
* | Use Facebook's dispatcher | Aldo Cortesi | 2015-01-01 | 3 | -63/+349 |
| | |||||
* | Replace custom EventEmitter with one from browserify | Aldo Cortesi | 2015-01-01 | 5 | -100/+343 |
| | |||||
* | Remove unused files | Aldo Cortesi | 2015-01-01 | 3 | -57/+0 |
| | |||||
* | All files and only files in in js/components are jsx | Aldo Cortesi | 2015-01-01 | 12 | -40/+40 |
| | | | | So remove the redundant naming | ||||
* | More browesrification. | Aldo Cortesi | 2014-12-31 | 6 | -81/+254 |
| | |||||
* | More conversions to browserify | Aldo Cortesi | 2014-12-30 | 6 | -39/+463 |
| | |||||
* | Fix fonts, stylesheets, add much more flexible bootstrap over-rides. | Aldo Cortesi | 2014-12-30 | 50 | -80411/+1088 |
| | |||||
* | Basic conversion: browserified web app now works. | Aldo Cortesi | 2014-12-30 | 33 | -43883/+45859 |
| | |||||
* | Start moving to new gulpfile, browerify, etc. | Aldo Cortesi | 2014-12-30 | 1 | -0/+14 |
| | |||||
* | Bump for next dev iteration | Aldo Cortesi | 2014-12-30 | 1 | -1/+1 |
| | |||||
* | Bump version | Aldo Cortesi | 2014-12-30 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-12-29 | 17 | -65/+338 |
|\ | |||||
| * | Minor tweaks to release checlist and binary builds | Aldo Cortesi | 2014-12-29 | 2 | -6/+3 |
| | | |||||
| * | Add netlib and libpathod as excludes in MANIFEST.in | Aldo Cortesi | 2014-12-28 | 1 | -1/+3 |
| | | | | | | | | These are commonly symlinked during dev | ||||
| * | Adjust how doc rendering uses mitmproxy source location | Aldo Cortesi | 2014-12-28 | 3 | -19/+14 |
| | | | | | | | | | | We now make sure our imports come from here too, and that we have mod cons like tilde expansion in the env variable. | ||||
| * | CHANGELOG | Aldo Cortesi | 2014-12-28 | 1 | -0/+7 |
| | | |||||
| * | Documentation for config files | Aldo Cortesi | 2014-12-28 | 4 | -3/+99 |
| | | |||||
| * | Generalize binary building, add static resources, add spec files for ↵ | Aldo Cortesi | 2014-12-28 | 4 | -25/+138 |
| | | | | | | | | | | | | | | mitmproxy, mitmdump and mitmweb We're now ready to use the same script (more or less) to build Windows binaries. | ||||
| * | Minor improvements to osx binary build process | Aldo Cortesi | 2014-12-28 | 3 | -6/+19 |
| | | | | | | | | | | - Add --shortversion on tools to make packaging easier - Automate tarfile generation | ||||
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2014-12-27 | 7 | -54/+174 |
| |\ | |||||
| * | | Move onboarding app to Tornado | Aldo Cortesi | 2014-12-27 | 6 | -23/+73 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | fix #435 | Maximilian Hils | 2014-12-29 | 1 | -0/+4 |
| | | | |||||
* | | | fix mitmproxy -w | Maximilian Hils | 2014-12-29 | 2 | -7/+7 |
| |/ |/| | |||||
* | | web: integrate filter docs | Maximilian Hils | 2014-12-26 | 7 | -54/+174 |
|/ | |||||
* | web: CSP, revert functionality, serve content | Maximilian Hils | 2014-12-25 | 10 | -147/+143 |
| |