aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* fix gzipped body editMaximilian Hils2014-12-232-17/+22
* web: intercept featureMaximilian Hils2014-12-2322-165/+303
* web: squash bugsMaximilian Hils2014-12-234-32/+24
* web: simpler filter uiMaximilian Hils2014-12-237-172/+88
* simplify codeMaximilian Hils2014-12-231-19/+13
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-12-234-27/+109
|\
| * Merge pull request #432 from tekii/masterMaximilian Hils2014-12-234-27/+109
| |\
| | * --replay_ignore_payload_params added, to filter params in form postsMarcelo Glezer2014-12-184-27/+109
| |/
* / highlight ui: complicated versionMaximilian Hils2014-12-225-33/+115
|/
* fix #427, tolerate servers that reject connections without SNIMaximilian Hils2014-12-151-2/+16
* allow specification of SSL version, only allow TLS1.0+ by defaultMaximilian Hils2014-12-154-22/+71
* web: filter/highlight ui, many fixesMaximilian Hils2014-12-1312-244/+809
* add filter descriptionsMaximilian Hils2014-12-122-30/+100
* web: disable autoscroll at topMaximilian Hils2014-12-122-2/+10
* web: filteringMaximilian Hils2014-12-128-470/+508
* web: fight against react-routerMaximilian Hils2014-12-128-19/+1825
* web: implement filtersMaximilian Hils2014-12-126-52/+1841
* Merge pull request #414 from mitmproxy/flowviews2Aldo Cortesi2014-12-1249-30328/+16583
|\
| * web: add filter grammarMaximilian Hils2014-12-112-2321/+93
| * web: add file menu stubMaximilian Hils2014-12-103-46/+2494
| * web: implement settings store, modularize storeMaximilian Hils2014-12-109-204/+321
| * web: take viewport resize into accountMaximilian Hils2014-12-104-58/+105