aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
* fix #459Maximilian Hils2015-02-052-6/+10
|
* fix ssl shutdown in tcp mode, refs #464Maximilian Hils2015-02-051-1/+3
|
* fix #464Maximilian Hils2015-02-052-5/+7
|
* clean up flow readingMaximilian Hils2015-02-053-33/+46
|
* Merge remote-tracking branch 'tekii/master'Maximilian Hils2015-02-053-10/+14
|\
| * open flow files using with as max suggestedMarcelo Glezer2015-01-122-4/+4
| |
| * Merge remote-tracking branch 'base/master'Marcelo Glezer2015-01-123-6/+18
| |\
| * | 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-052-6/+8
| | |
* | | fix statusbar initializationMaximilian Hils2015-02-051-0/+2
| | |
* | | missing parameter in start_server_playback callMarcelo Glezer2015-01-131-2/+4
| | |
* | | hotfix to mitmproxy missing start_server_playback() parameter added. ↵Marcelo Glezer2015-01-121-1/+1
| |/ |/| | | | | backported from PR [#439]
* | document choice of timeout value, refs #443Maximilian Hils2015-01-091-0/+4
| |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-01-091-2/+10
|\ \
| * | Error to stdout when loading bad replays from the command lineNick HS2015-01-081-2/+10
| |/
* / fix #443Maximilian Hils2015-01-093-4/+4
|/
* Add PEG support to gulpfileAldo Cortesi2015-01-032-562/+564
| | | | | - Extract conf - all project specific conf outside gulpfile - Generalize filt.js exports, add required imports
* Unit test framework for web client-side codeAldo Cortesi2015-01-022-9/+15
| | | | | | - Also make formatSize nicer and test it. Now there's no excuse! ;)
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-01-021-10/+18
|\
| * we do not support https2http in upstream proxy modeMaximilian Hils2015-01-011-10/+18
| |
* | Consolidate reading flows from file, use in mitmweb.Aldo Cortesi2015-01-025-27/+49
|/
* components/utils.js -> common.jsAldo Cortesi2015-01-011-223/+221
| | | | | Too many utils modules makes things confusing. These are more "common components" or "common mixins" than utils anyway.
* Make header more compactAldo Cortesi2015-01-012-9/+3
| | | | | - Remove title bar - File -> mitmproxy - ultimately our logo can go here
* Use Facebook's dispatcherAldo Cortesi2015-01-011-41/+343
|
* Replace custom EventEmitter with one from browserifyAldo Cortesi2015-01-011-60/+333
|
* All files and only files in in js/components are jsxAldo Cortesi2015-01-011-24/+24
| | | | So remove the redundant naming
* More browesrification.Aldo Cortesi2014-12-311-48/+209
|
* More conversions to browserifyAldo Cortesi2014-12-301-21/+427
|
* Fix fonts, stylesheets, add much more flexible bootstrap over-rides.Aldo Cortesi2014-12-3021-581/+1524
|
* Basic conversion: browserified web app now works.Aldo Cortesi2014-12-307-43712/+44741
|
* 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-295-23/+80
|\
| * Documentation for config filesAldo Cortesi2014-12-281-1/+2
| |
| * Minor improvements to osx binary build processAldo Cortesi2014-12-281-3/+8
| | | | | | | | | | - Add --shortversion on tools to make packaging easier - Automate tarfile generation
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-12-274-10/+98
| |\
| * | Move onboarding app to TornadoAldo Cortesi2014-12-274-20/+71
| | | | | | | | | | | | | | | | | | | | | 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-264-10/+98
|/
* web: CSP, revert functionality, serve contentMaximilian Hils2014-12-256-89/+114
|
* web: show mitmproxy versionMaximilian Hils2014-12-251-0/+2
|
* web: much ui work, such christmasMaximilian Hils2014-12-254-57/+165
|
* bump version, update release checklistMaximilian Hils2014-12-241-1/+1
|
* web: duplicate, delete, replay flowsMaximilian Hils2014-12-245-132/+225
|
* web: move eventlog state out of settingsMaximilian Hils2014-12-233-16/+47
|
* fix gzipped body editMaximilian Hils2014-12-231-15/+20
|
* web: intercept featureMaximilian Hils2014-12-2311-108/+206
|
* web: squash bugsMaximilian Hils2014-12-231-16/+12
|
* web: simpler filter uiMaximilian Hils2014-12-232-87/+43
|