aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * web: add event store, fix all those bugsMaximilian Hils2014-12-1017-507/+335
| * generalize storeMaximilian Hils2014-12-095-241/+259
| * always use the app dispatcherMaximilian Hils2014-12-0924-16210/+2491
| * web: various improvementsMaximilian Hils2014-11-297-58/+168
| * event log: virtual scrollingMaximilian Hils2014-11-285-75/+137
| * web: add virtualscroll mixinMaximilian Hils2014-11-284-96/+143
| * web: various fixes, add clear buttonMaximilian Hils2014-11-289-70/+156
| * web: virtual scrollingMaximilian Hils2014-11-284-96/+190
| * web: fixesMaximilian Hils2014-11-273-26/+42
| * format codeMaximilian Hils2014-11-2713-296/+306
| * web++Maximilian Hils2014-11-2712-423/+477
| * web: update dependenciesMaximilian Hils2014-11-274-13039/+11952
| * introduce revised views, port over changes from multiple_views branchMaximilian Hils2014-11-2613-327/+679
* | Merge pull request #425 from tekii/masterMaximilian Hils2014-12-113-10/+23
|\ \
| * | append file mode for saving flows merged to masterMarcelo Glezer2014-12-113-10/+23