aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #110Maximilian Hils2015-02-071-0/+6
* fix #451Maximilian Hils2015-02-074-22/+35
* upgrading packages should not be neccesary on travisMaximilian Hils2015-02-071-1/+1
* fix tests, re-enable pypy, do housekeepingMaximilian Hils2015-02-074-10/+11
* Update README.mkdMaximilian Hils2015-02-061-2/+6
* fix testsMaximilian Hils2015-02-061-1/+1
* Merge remote-tracking branch 'origin/contributing'Maximilian Hils2015-02-061-0/+39
|\
| * Create CONTRIBUTING.mdMaximilian Hils2015-02-051-0/+39
* | fix testsMaximilian Hils2015-02-051-6/+12
|/
* 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-054-34/+47
* Merge remote-tracking branch 'tekii/master'Maximilian Hils2015-02-054-13/+17
|\
| * 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 remote-tracking branch 'base/master'Marcelo Glezer2015-01-125-8/+44
| |\ \
| * | | 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
* | | | 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
|/ / /
* | | 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
|/ /
* | 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
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 09:41:10 +0000