Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1273 from Kriechi/fix-default-arg | Maximilian Hils | 2016-06-20 | 1 | -1/+4 |
|\ | |||||
| * | fix default arg | Thomas Kriechbaumer | 2016-06-19 | 1 | -1/+4 |
* | | py3++ | Shadab Zafar | 2016-06-20 | 1 | -6/+7 |
* | | py3++ | Shadab Zafar | 2016-06-20 | 1 | -7/+7 |
* | | Merge remote-tracking branch 'jason/settings' | Maximilian Hils | 2016-06-19 | 1 | -14/+14 |
|\ \ | |||||
| * | | [web] replace SetttingsActions.update with settings.updateSettings | Jason | 2016-06-19 | 1 | -14/+14 |
* | | | py3++ | Thomas Kriechbaumer | 2016-06-19 | 3 | -7/+8 |
| |/ |/| | |||||
* | | mitmproxy/models: missed comma in __all__ | Doug Freed | 2016-06-18 | 1 | -2/+2 |
|/ | |||||
* | simplify settings reducer | Maximilian Hils | 2016-06-17 | 2 | -2/+2 |
* | [web] simplify settings | Jason | 2016-06-17 | 1 | -2/+2 |
* | Merge branch 'master' into settings | Jason | 2016-06-17 | 2 | -59/+89 |
|\ | |||||
| * | [web] clean up | Jason | 2016-06-17 | 1 | -2/+2 |
| * | [web] common | Jason | 2016-06-17 | 1 | -46/+55 |
| * | [web] Editor & Prompt | Jason | 2016-06-17 | 1 | -47/+53 |
| * | [web] FlowView and ContentView | Jason | 2016-06-17 | 3 | -61862/+687 |
* | | [web] fix settings ducks | Jason | 2016-06-17 | 2 | -154/+160 |
* | | [web] promot reduce | Jason | 2016-06-17 | 1 | -2/+2 |
* | | [web] remove store | Jason | 2016-06-17 | 1 | -1/+1 |
* | | [web] settings store | Jason | 2016-06-17 | 3 | -61730/+531 |
|/ | |||||
* | Merge branch 'add_flow_to_options' | Maximilian Hils | 2016-06-15 | 3 | -670/+61866 |
|\ | |||||
| * | rename view -> ui, make code more readable | Clemens | 2016-06-15 | 1 | -65/+67 |
| * | add previous state to dispatch function | Clemens | 2016-06-15 | 1 | -21/+37 |
| * | code review | Clemens | 2016-06-14 | 1 | -43/+19 |
| * | added flowMenu | Clemens | 2016-06-14 | 3 | -670/+61872 |
* | | Don't fail when start() is not defined | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 |
* | | fix contextmanager, remove args argument to start() | Maximilian Hils | 2016-06-13 | 1 | -3/+15 |
* | | A tiny wrapper to make script invocations nicer | Aldo Cortesi | 2016-06-14 | 1 | -1/+11 |
|/ | |||||
* | fix #1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 |
* | Fold mitmproxy.version and pathod.version into netlib.version | Aldo Cortesi | 2016-06-12 | 8 | -24/+13 |
* | debug: On SIGUSR2, we dump tracebacks for all threads to screen | Aldo Cortesi | 2016-06-11 | 1 | -1/+1 |
* | Improve debugging of thread and other leaks | Aldo Cortesi | 2016-06-11 | 5 | -11/+23 |
* | Add a --sysinfo flag to all daemons | Aldo Cortesi | 2016-06-11 | 2 | -8/+18 |
* | [web] update build | Jason | 2016-06-09 | 3 | -61562/+493 |
* | [web] header.js -> Header.js | Jason | 2016-06-09 | 3 | -519/+61606 |
* | [web] eventlog.js -> EventLog.jsx | Jason | 2016-06-09 | 1 | -36/+39 |
* | [web] footer.js -> Footer.jsx | Jason | 2016-06-09 | 1 | -16/+16 |
* | [web] fix shortcut for header fields | Jason | 2016-06-09 | 1 | -1/+1 |
* | [web] separate flowtable to multiple files | Jason | 2016-06-09 | 1 | -37/+43 |
* | [web] update build | Jason | 2016-06-09 | 3 | -61343/+488 |
* | [web] fix updateLocation | Jason | 2016-06-09 | 2 | -656/+841 |
* | Remove odict | Aldo Cortesi | 2016-06-09 | 1 | -4/+4 |
* | Merge pull request #1220 from mitmproxy/add_sorting_with_redux | Maximilian Hils | 2016-06-08 | 2 | -755/+1021 |
|\ | |||||
| * | sorting add pr review changes | Clemens | 2016-06-08 | 1 | -12/+34 |
| * | sorting done, ready to review | Clemens | 2016-06-07 | 1 | -6/+4 |
| * | sorting done, ready to review | Clemens | 2016-06-07 | 1 | -38/+32 |
| * | moved redux state injection closer to child | Clemens | 2016-06-07 | 1 | -12/+32 |
| * | start with sort, continue tomorrow | Clemens | 2016-06-07 | 1 | -30/+11 |
| * | moved sort state to redux, missing apply sort | Clemens | 2016-06-07 | 2 | -741/+992 |
* | | fix after cleanup of netlib.utils in mitmproxy.console.statusbar | redfast00 | 2016-06-08 | 1 | -2/+2 |
* | | If a message has been acked, all other processors are skipped | Aldo Cortesi | 2016-06-08 | 1 | -22/+30 |