aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* now content and header are working and exception for binary files are handled...Marcelo Glezer2015-02-052-11/+16
* wip - content copy is working, header representation is notMarcelo Glezer2015-02-052-0/+31
* added pyperclip dependencyMarcelo Glezer2015-02-051-1/+2
* Merge remote-tracking branch 'base/master'Marcelo Glezer2015-02-052-5/+7
|\
| * fix #464Maximilian Hils2015-02-052-5/+7
* | Merge remote-tracking branch 'base/master'Marcelo Glezer2015-02-054-34/+47
|\|
| * clean up flow readingMaximilian Hils2015-02-054-34/+47
| * Merge remote-tracking branch 'tekii/master'Maximilian Hils2015-02-054-13/+17
| |\
* | | Merge remote-tracking branch 'base/master'Marcelo Glezer2015-02-052-2/+6
|\| | | |/ |/|
| * fix statusbar initializationMaximilian Hils2015-02-051-0/+2
| * Merge pull request #447 from tekii/server-replay-missing-argsMaximilian Hils2015-02-051-2/+4
| |\
| | * missing parameter in start_server_playback callMarcelo Glezer2015-01-131-2/+4
| |/
* | open flow files using with as max suggestedMarcelo Glezer2015-01-122-4/+4
* | Merge remote-tracking branch 'base/master'Marcelo Glezer2015-01-120-0/+0
|\|
| * Merge pull request #445 from tekii/hotfix-start-server-playbackMaximilian Hils2015-01-121-1/+1
| |\
| | * hotfix to mitmproxy missing start_server_playback() parameter added. backport...Marcelo Glezer2015-01-121-1/+1
| |/
* | Merge remote-tracking branch 'base/master'Marcelo Glezer2015-01-125-8/+44
|\|
| * document choice of timeout value, refs #443Maximilian Hils2015-01-091-0/+4
| * Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-01-092-4/+12
| |\
| | * Merge pull request #442 from nickhs/441Maximilian Hils2015-01-091-2/+10
| | |\
| | | * Error to stdout when loading bad replays from the command lineNick HS2015-01-081-2/+10
| | |/
| | * Merge pull request #440 from michaeljau/patch-2Maximilian Hils2015-01-071-2/+2
| | |\
| | | * Update inlinescripts.htmlmichaeljau2015-01-071-2/+2
| | |/
| * / fix #443Maximilian Hils2015-01-094-4/+28
| |/
* | now mitmproxy supports multiple saved flows files too. also fixed server_play...Marcelo Glezer2015-01-061-5/+7
* | first steps in scenario supportMarcelo Glezer2015-01-053-9/+11
|/
* Pin browserify to most recent version that worksAldo Cortesi2015-01-041-1/+1
* Ditch old gulpfileAldo Cortesi2015-01-032-180/+0
* Add PEG support to gulpfileAldo Cortesi2015-01-038-646/+670
* Fix unit testsAldo Cortesi2015-01-021-2/+2
* Unit test framework for web client-side codeAldo Cortesi2015-01-026-55/+91
* 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
* | Consolidate reading flows from file, use in mitmweb.Aldo Cortesi2015-01-026-30/+60
|/
* components/utils.js -> common.jsAldo Cortesi2015-01-018-241/+237
* Make header more compactAldo Cortesi2015-01-014-20/+5
* 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
* 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