aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* now mitmproxy supports multiple saved flows files too. also fixed ↵Marcelo Glezer2015-01-061-5/+7
| | | | server_play_back start with mitmproxy (missing parameter)
* first steps in scenario supportMarcelo Glezer2015-01-053-9/+11
|
* Pin browserify to most recent version that worksAldo Cortesi2015-01-041-1/+1
| | | | | | Issue being tracked here: https://github.com/substack/node-browserify/issues/1044
* Ditch old gulpfileAldo Cortesi2015-01-032-180/+0
|
* Add PEG support to gulpfileAldo Cortesi2015-01-038-646/+670
| | | | | - Extract conf - all project specific conf outside gulpfile - Generalize filt.js exports, add required imports
* Fix unit testsAldo Cortesi2015-01-021-2/+2
|
* Unit test framework for web client-side codeAldo Cortesi2015-01-026-55/+91
| | | | | | - Also make formatSize nicer and test it. Now there's no excuse! ;)
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-01-022-24/+18
|\
| * we do not support https2http in upstream proxy modeMaximilian Hils2015-01-012-24/+18
| |
* | Clean up har_extractor exampleAldo Cortesi2015-01-021-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 Cortesi2015-01-026-30/+60
|/
* components/utils.js -> common.jsAldo Cortesi2015-01-018-241/+237
| | | | | Too many utils modules makes things confusing. These are more "common components" or "common mixins" than utils anyway.
* Make header more compactAldo Cortesi2015-01-014-20/+5
| | | | | - Remove title bar - File -> mitmproxy - ultimately our logo can go here
* Use Facebook's dispatcherAldo Cortesi2015-01-013-63/+349
|
* Replace custom EventEmitter with one from browserifyAldo Cortesi2015-01-015-100/+343
|
* Remove unused filesAldo Cortesi2015-01-013-57/+0
|
* All files and only files in in js/components are jsxAldo Cortesi2015-01-0112-40/+40
| | | | So remove the redundant naming
* More browesrification.Aldo Cortesi2014-12-316-81/+254
|
* More conversions to browserifyAldo Cortesi2014-12-306-39/+463
|
* Fix fonts, stylesheets, add much more flexible bootstrap over-rides.Aldo Cortesi2014-12-3050-80411/+1088
|
* Basic conversion: browserified web app now works.Aldo Cortesi2014-12-3033-43883/+45859
|
* Start moving to new gulpfile, browerify, etc.Aldo Cortesi2014-12-301-0/+14
|
* Bump for next dev iterationAldo Cortesi2014-12-301-1/+1
|
* Bump versionAldo Cortesi2014-12-301-2/+2
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-12-2917-65/+338
|\
| * Minor tweaks to release checlist and binary buildsAldo Cortesi2014-12-292-6/+3
| |
| * Add netlib and libpathod as excludes in MANIFEST.inAldo Cortesi2014-12-281-1/+3
| | | | | | | | These are commonly symlinked during dev
| * Adjust how doc rendering uses mitmproxy source locationAldo Cortesi2014-12-283-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.
| * CHANGELOGAldo Cortesi2014-12-281-0/+7
| |
| * Documentation for config filesAldo Cortesi2014-12-284-3/+99
| |
| * Generalize binary building, add static resources, add spec files for ↵Aldo Cortesi2014-12-284-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 processAldo Cortesi2014-12-283-6/+19
| | | | | | | | | | - Add --shortversion on tools to make packaging easier - Automate tarfile generation
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-12-277-54/+174
| |\
| * | Move onboarding app to TornadoAldo Cortesi2014-12-276-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 #435Maximilian Hils2014-12-291-0/+4
| | |
* | | fix mitmproxy -wMaximilian Hils2014-12-292-7/+7
| |/ |/|
* | web: integrate filter docsMaximilian Hils2014-12-267-54/+174
|/
* web: CSP, revert functionality, serve contentMaximilian Hils2014-12-2510-147/+143
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-12-251-1/+1
|\
| * travis: oftc seems to require channel joinMaximilian Hils2014-12-241-2/+0
| |
| * travis: don't join irc channelMaximilian Hils2014-12-241-1/+3
| |
* | web: show mitmproxy versionMaximilian Hils2014-12-251-0/+2
| |
* | web: much ui work, such christmasMaximilian Hils2014-12-2510-182/+400
|/
* travis: cache pypyMaximilian Hils2014-12-241-1/+2
|
* travis testsMaximilian Hils2014-12-241-1/+2
|
* bump version, update release checklistMaximilian Hils2014-12-242-7/+2
|
* enable travis cachingMaximilian Hils2014-12-241-1/+3
|
* fix tests, experimental travis speedupMaximilian Hils2014-12-243-2/+6
|
* web: duplicate, delete, replay flowsMaximilian Hils2014-12-2411-235/+372
|
* web: move eventlog state out of settingsMaximilian Hils2014-12-239-31/+94
|