aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| * Adjust how doc rendering uses mitmproxy source locationAldo Cortesi2014-12-283-19/+14
| * 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 mitmprox...Aldo Cortesi2014-12-284-25/+138
| * Minor improvements to osx binary build processAldo Cortesi2014-12-283-6/+19
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-12-277-54/+174
| |\
| * | Move onboarding app to TornadoAldo Cortesi2014-12-276-23/+73
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:57:38 +0000