Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added contentHash | Clemens | 2016-07-25 | 3 | -6/+10 |
| | |||||
* | remove lastFileUpload field | Clemens | 2016-07-25 | 5 | -24/+10 |
| | |||||
* | file upload updates contentview, editable contentloader, diffs on upload | Clemens | 2016-07-22 | 8 | -47/+65 |
| | |||||
* | moved editor to raw_view mode, add content_file_upload | Clemens | 2016-07-21 | 6 | -25/+50 |
| | |||||
* | moved editor to raw_view mode | Clemens | 2016-07-21 | 4 | -41/+39 |
| | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-07-21 | 10 | -274/+276 |
|\ | |||||
| * | Merge pull request #1385 from mitmproxy/console | Aldo Cortesi | 2016-07-21 | 3 | -9/+7 |
| |\ | | | | | | | console: nopop, rheaders into Options | ||||
| | * | console: nopop, rheaders into Options | Aldo Cortesi | 2016-07-21 | 3 | -9/+7 |
| |/ | |||||
| * | console: share one ActionBar instance | Aldo Cortesi | 2016-07-21 | 3 | -4/+4 |
| | | | | | | | | | | This fixes an issues where popping a view off the stack caused stale ActionBar contents to be displayed. | ||||
| * | Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into ↵ | Aldo Cortesi | 2016-07-21 | 5 | -260/+248 |
| |\ | | | | | | | | | | dufferzafar-flow-export | ||||
| | * | Fix hotkey kerfuffle | Shadab Zafar | 2016-07-20 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | `z` (instead of `C`) to "clear flow list or eventlog" `C` to "export flow to clipboard" `E` to "export flow to file" | ||||
| | * | Make necessary changes in flowview | Shadab Zafar | 2016-07-20 | 1 | -23/+28 |
| | | | |||||
| | * | Refactor exporters | Shadab Zafar | 2016-07-20 | 3 | -25/+18 |
| | | | |||||
| | * | Add a url exporter | Shadab Zafar | 2016-07-20 | 2 | -0/+10 |
| | | | |||||
| | * | Ask for scope when called from flowlist | Shadab Zafar | 2016-07-20 | 2 | -63/+80 |
| | | | |||||
| | * | Integrate ask_copy_part into exporters | Shadab Zafar | 2016-07-20 | 3 | -27/+23 |
| | | | | | | | | | | | | This introduces some duplication but that'll be refactored later. | ||||
| | * | Remove raw_request exporter | Shadab Zafar | 2016-07-20 | 2 | -42/+0 |
| | | | | | | | | | | | | This functionality will be handled by headers+content | ||||
| | * | s/part/key | Shadab Zafar | 2016-07-20 | 2 | -27/+22 |
| | | | |||||
| | * | Don't send master and state parameters | Shadab Zafar | 2016-07-20 | 2 | -8/+8 |
| | | | |||||
| | * | Refactor | Shadab Zafar | 2016-07-20 | 1 | -111/+112 |
| | | | |||||
| | * | Common function for both file and clipboard | Shadab Zafar | 2016-07-20 | 2 | -18/+22 |
| | | | |||||
| | * | Export to file (p) or clipboard (P) | Shadab Zafar | 2016-07-20 | 3 | -13/+24 |
| | | | |||||
| | * | Exporters list | Shadab Zafar | 2016-07-20 | 3 | -16/+14 |
| | | | |||||
| * | | Fix netlib.utils.is_valid_host | Aldo Cortesi | 2016-07-21 | 3 | -2/+18 |
| |/ | | | | | | | | | | | | | | | - Don't crash when passed an empty string. This translated into an actual core crash, discovered while fuzzing with afl. - Taking a slice of length one out of bytes returns an integer, so the check for trailing period in this function never worked on Python3. - Add unit tests. | ||||
* | | web: fix ValueEditor, clean up code | Maximilian Hils | 2016-07-21 | 27 | -747/+657 |
| | | |||||
* | | web: fix flow content update | Maximilian Hils | 2016-07-21 | 1 | -13/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/flow_editing' | Maximilian Hils | 2016-07-20 | 15 | -32/+241 |
|\ \ | |/ |/| | |||||
| * | added flow_content update | Clemens | 2016-07-19 | 4 | -50/+98 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into flow_editing | Clemens | 2016-07-19 | 197 | -4960/+5992 |
| |\ | |||||
| * | | moved flow editor state to redux | Clemens | 2016-07-19 | 9 | -58/+118 |
| | | | |||||
| * | | added new btn, changed to codemirror | Clemens | 2016-07-15 | 7 | -40/+51 |
| | | | |||||
| * | | change way to edit | Clemens | 2016-07-14 | 9 | -89/+130 |
| | | | |||||
| * | | chaged editor style | Clemens | 2016-07-13 | 1 | -2/+2 |
| | | | |||||
| * | | gzip issue | Clemens | 2016-07-13 | 1 | -0/+1 |
| | | | |||||
| * | | make file out ouf string to combine flow content updates via editor and ↵ | Clemens | 2016-07-13 | 2 | -4/+3 |
| | | | | | | | | | | | | fileupload | ||||
| * | | added code editor and file upload | Clemens | 2016-07-13 | 9 | -56/+115 |
| | | | |||||
| * | | modify flow content | Clemens | 2016-07-11 | 7 | -12/+61 |
| | | | |||||
* | | | minor fixes | Maximilian Hils | 2016-07-19 | 4 | -4/+5 |
| | | | |||||
* | | | Merge pull request #1383 from cortesi/options | Aldo Cortesi | 2016-07-20 | 21 | -287/+287 |
|\ \ \ | | | | | | | | | mitmproxy.flow.options -> mitmproxy.options | ||||
| * | | | mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> ↵ | Aldo Cortesi | 2016-07-20 | 21 | -287/+287 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | mitmproxy.options It might be slightly more felicitous to move optmanager into netlib at some point, especially if we can also use it in pathod. This also consolidates our constants in mitmproxy.options, removing some duplicates. | ||||
* | | | Merge pull request #1382 from cortesi/cleanup | Aldo Cortesi | 2016-07-20 | 5 | -61/+72 |
|\ \ \ | |_|/ |/| | | [wip] ProxyConf-related refactoring | ||||
| * | | Merge branch 'master' into cleanup | Aldo Cortesi | 2016-07-19 | 28 | -895/+800 |
| |\ \ | |/ / |/| | | |||||
* | | | web: fix flow selection | Maximilian Hils | 2016-07-19 | 2 | -2/+2 |
| | | | |||||
* | | | update web assets | Maximilian Hils | 2016-07-19 | 2 | -484/+472 |
| | | | |||||
* | | | simplify web ui ducks | Maximilian Hils | 2016-07-19 | 23 | -400/+316 |
| | | | |||||
* | | | fix web master options leftovers | Maximilian Hils | 2016-07-19 | 2 | -7/+8 |
| | | | |||||
* | | | update README about Python support | Thomas Kriechbaumer | 2016-07-19 | 1 | -3/+3 |
| | | | |||||
| * | | Test suite: get_proxy_config -> get_options | Aldo Cortesi | 2016-07-19 | 3 | -41/+57 |
| | | | |||||
| * | | Simplify common initilization in cmdline.py | Aldo Cortesi | 2016-07-19 | 2 | -20/+15 |
|/ / | |||||
* | | Merge pull request #1379 from cortesi/proxyconfig | Aldo Cortesi | 2016-07-19 | 26 | -534/+626 |
|\ \ | | | | | | | Unify ProxyConfig and Options |