aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [web] settings storeJason2016-06-179-61763/+626
* web: fix testsMaximilian Hils2016-06-162-12/+9
* web: use implicit bindActionCreatorsMaximilian Hils2016-06-155-15/+10
* Merge branch 'add_flow_to_options'Maximilian Hils2016-06-1511-691/+61989
|\
| * minor fixesMaximilian Hils2016-06-153-14/+19
| * rename view -> ui, make code more readableClemens2016-06-154-76/+79
| * add previous state to dispatch functionClemens2016-06-155-41/+67
| * code reviewClemens2016-06-144-84/+36
| * added flowMenuClemens2016-06-149-684/+61996
* | Enable Travis for test/pathod/test_pathocShadab Zafar2016-06-151-1/+1
* | Unexpected spaces around =Shadab Zafar2016-06-152-2/+2
* | Py3: Split on byte newlines in pathod.logShadab Zafar2016-06-151-1/+1
* | Py3: Find Content-Length header by bytesShadab Zafar2016-06-151-1/+1
* | Py3: pathocShadab Zafar2016-06-153-26/+34
* | Py3: pathodShadab Zafar2016-06-152-14/+10
* | Py3: websocketsShadab Zafar2016-06-153-5/+6
* | Py3: fix http2 bytes issueShadab Zafar2016-06-152-3/+3
* | Merge pull request #1257 from tdickers/masterMaximilian Hils2016-06-142-4/+7
|\ \
| * | Make har_extractor.py output HAR 1.2 spec-compliantTai Dickerson2016-06-142-4/+7
|/ /
* | Merge pull request #1253 from mhils/fix-debugAldo Cortesi2016-06-142-3/+9
|\ \
| * | fix debug mode on WindowsMaximilian Hils2016-06-132-3/+9
| |/
* | Merge pull request #1251 from cortesi/netlibraceAldo Cortesi2016-06-146-324/+337
|\ \
| * \ Merge branch 'master' into netlibraceAldo Cortesi2016-06-1416-34/+63
| |\ \ | |/ / |/| |
* | | Merge pull request #1254 from mitmproxy/scriptargsAldo Cortesi2016-06-1416-34/+63
|\ \ \ | |_|/ |/| |
| * | Don't fail when start() is not definedAldo Cortesi2016-06-141-1/+1
| * | update examples, tests, docsMaximilian Hils2016-06-1315-32/+39
| * | 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 Python3 testsAldo Cortesi2016-06-141-1/+1
| * Merge branch 'netlibrace' of github.com:cortesi/mitmproxy into netlibraceAldo Cortesi2016-06-140-0/+0
| |\
| | * Use handlers in http2 test suiteAldo Cortesi2016-06-141-100/+100
| | * Merge remote-tracking branch 'upstream/master' into netlibraceAldo Cortesi2016-06-141-55/+83
| | |\ | |_|/ |/| |
| | * Start rolling out leak detection in netlibAldo Cortesi2016-06-125-224/+237
| * | Satisfy lintAldo Cortesi2016-06-141-1/+1
| * | Use handlers in http2 test suiteAldo Cortesi2016-06-141-100/+100
| * | Start rolling out leak detection in netlibAldo Cortesi2016-06-145-224/+237
|/ /
* | Merge pull request #1242 from Kriechi/fix-1240Thomas Kriechbaumer2016-06-121-55/+83
|\ \ | |/ |/|
| * fix #1240Thomas Kriechbaumer2016-06-121-55/+83
|/
* Merge pull request #1247 from cortesi/appveyorAldo Cortesi2016-06-123-43/+62
|\
| * Merge branch 'master' into appveyorAldo Cortesi2016-06-1216-51/+34
| |\ | |/ |/|
* | Merge pull request #1246 from cortesi/versionAldo Cortesi2016-06-1216-51/+34
|\ \
| * | Fold mitmproxy.version and pathod.version into netlib.versionAldo Cortesi2016-06-1216-51/+34
|/ /
| * Make the tcp connection closer cancellableAldo Cortesi2016-06-122-42/+55
| * Be stricter about handling connetcts in the pathoc test suiteAldo Cortesi2016-06-121-1/+7
|/
* Merge pull request #1243 from cortesi/debug2Thomas Kriechbaumer2016-06-113-2/+26
|\
| * Satisfy lintAldo Cortesi2016-06-111-1/+5
| * debug: On SIGUSR2, we dump tracebacks for all threads to screenAldo Cortesi2016-06-113-2/+22
|/
* Merge pull request #1241 from cortesi/debugAldo Cortesi2016-06-1113-46/+183
|\
| * Zap stray semicolonAldo Cortesi2016-06-111-1/+1
| * debug: num_fds is posix-onlyAldo Cortesi2016-06-111-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 05:49:49 +0000