aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1273 from Kriechi/fix-default-argMaximilian Hils2016-06-201-1/+4
|\
| * fix default argThomas Kriechbaumer2016-06-191-1/+4
* | py3++Shadab Zafar2016-06-201-6/+7
* | py3++Shadab Zafar2016-06-201-7/+7
* | Merge remote-tracking branch 'jason/settings'Maximilian Hils2016-06-191-14/+14
|\ \
| * | [web] replace SetttingsActions.update with settings.updateSettingsJason2016-06-191-14/+14
* | | py3++Thomas Kriechbaumer2016-06-193-7/+8
| |/ |/|
* | mitmproxy/models: missed comma in __all__Doug Freed2016-06-181-2/+2
|/
* simplify settings reducerMaximilian Hils2016-06-172-2/+2
* [web] simplify settingsJason2016-06-171-2/+2
* Merge branch 'master' into settingsJason2016-06-172-59/+89
|\
| * [web] clean upJason2016-06-171-2/+2
| * [web] commonJason2016-06-171-46/+55
| * [web] Editor & PromptJason2016-06-171-47/+53
| * [web] FlowView and ContentViewJason2016-06-173-61862/+687
* | [web] fix settings ducksJason2016-06-172-154/+160
* | [web] promot reduceJason2016-06-171-2/+2
* | [web] remove storeJason2016-06-171-1/+1
* | [web] settings storeJason2016-06-173-61730/+531
|/
* Merge branch 'add_flow_to_options'Maximilian Hils2016-06-153-670/+61866
|\
| * rename view -> ui, make code more readableClemens2016-06-151-65/+67
| * add previous state to dispatch functionClemens2016-06-151-21/+37
| * code reviewClemens2016-06-141-43/+19
| * added flowMenuClemens2016-06-143-670/+61872
* | Don't fail when start() is not definedAldo Cortesi2016-06-141-1/+1
* | fix contextmanager, remove args argument to start()Maximilian Hils2016-06-131-3/+15
* | A tiny wrapper to make script invocations nicerAldo Cortesi2016-06-141-1/+11
|/
* fix #1240Thomas Kriechbaumer2016-06-121-55/+83
* Fold mitmproxy.version and pathod.version into netlib.versionAldo Cortesi2016-06-128-24/+13
* debug: On SIGUSR2, we dump tracebacks for all threads to screenAldo Cortesi2016-06-111-1/+1
* Improve debugging of thread and other leaksAldo Cortesi2016-06-115-11/+23
* Add a --sysinfo flag to all daemonsAldo Cortesi2016-06-112-8/+18
* [web] update buildJason2016-06-093-61562/+493
* [web] header.js -> Header.jsJason2016-06-093-519/+61606
* [web] eventlog.js -> EventLog.jsxJason2016-06-091-36/+39
* [web] footer.js -> Footer.jsxJason2016-06-091-16/+16
* [web] fix shortcut for header fieldsJason2016-06-091-1/+1
* [web] separate flowtable to multiple filesJason2016-06-091-37/+43
* [web] update buildJason2016-06-093-61343/+488
* [web] fix updateLocationJason2016-06-092-656/+841
* Remove odictAldo Cortesi2016-06-091-4/+4
* Merge pull request #1220 from mitmproxy/add_sorting_with_reduxMaximilian Hils2016-06-082-755/+1021
|\
| * sorting add pr review changesClemens2016-06-081-12/+34
| * sorting done, ready to reviewClemens2016-06-071-6/+4
| * sorting done, ready to reviewClemens2016-06-071-38/+32
| * moved redux state injection closer to childClemens2016-06-071-12/+32
| * start with sort, continue tomorrowClemens2016-06-071-30/+11
| * moved sort state to redux, missing apply sortClemens2016-06-072-741/+992
* | fix after cleanup of netlib.utils in mitmproxy.console.statusbarredfast002016-06-081-2/+2
* | If a message has been acked, all other processors are skippedAldo Cortesi2016-06-081-22/+30