Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1263 from Kriechi/readme | Maximilian Hils | 2016-06-16 | 2 | -0/+22 | |
|\ \ \ | |/ / |/| | | Update README with information about tox & flake8. | |||||
| * | | hide codecov.yml | Thomas Kriechbaumer | 2016-06-16 | 2 | -0/+3 | |
| | | | ||||||
| * | | update README with tox and flake8 info | Thomas Kriechbaumer | 2016-06-16 | 1 | -0/+19 | |
| | | | ||||||
| | * | [web] fix settings ducks | Jason | 2016-06-17 | 4 | -163/+185 | |
| | | | ||||||
| | * | [web] promot reduce | Jason | 2016-06-17 | 2 | -18/+21 | |
| | | | ||||||
| | * | [web] remove store | Jason | 2016-06-17 | 4 | -99/+8 | |
| | | | ||||||
| | * | [web] eliminate SettingsStore | Jason | 2016-06-17 | 1 | -5/+0 | |
| | | | ||||||
| | * | [web] settings store | Jason | 2016-06-17 | 9 | -61763/+626 | |
| |/ |/| | ||||||
* | | web: fix tests | Maximilian Hils | 2016-06-16 | 2 | -12/+9 | |
|/ | ||||||
* | web: use implicit bindActionCreators | Maximilian Hils | 2016-06-15 | 5 | -15/+10 | |
| | ||||||
* | Merge branch 'add_flow_to_options' | Maximilian Hils | 2016-06-15 | 11 | -691/+61989 | |
|\ | ||||||
| * | minor fixes | Maximilian Hils | 2016-06-15 | 3 | -14/+19 | |
| | | ||||||
| * | rename view -> ui, make code more readable | Clemens | 2016-06-15 | 4 | -76/+79 | |
| | | ||||||
| * | add previous state to dispatch function | Clemens | 2016-06-15 | 5 | -41/+67 | |
| | | ||||||
| * | code review | Clemens | 2016-06-14 | 4 | -84/+36 | |
| | | ||||||
| * | added flowMenu | Clemens | 2016-06-14 | 9 | -684/+61996 | |
| | | ||||||
* | | Enable Travis for test/pathod/test_pathoc | Shadab Zafar | 2016-06-15 | 1 | -1/+1 | |
| | | ||||||
* | | Unexpected spaces around = | Shadab Zafar | 2016-06-15 | 2 | -2/+2 | |
| | | ||||||
* | | Py3: Split on byte newlines in pathod.log | Shadab Zafar | 2016-06-15 | 1 | -1/+1 | |
| | | ||||||
* | | Py3: Find Content-Length header by bytes | Shadab Zafar | 2016-06-15 | 1 | -1/+1 | |
| | | ||||||
* | | Py3: pathoc | Shadab Zafar | 2016-06-15 | 3 | -26/+34 | |
| | | ||||||
* | | Py3: pathod | Shadab Zafar | 2016-06-15 | 2 | -14/+10 | |
| | | ||||||
* | | Py3: websockets | Shadab Zafar | 2016-06-15 | 3 | -5/+6 | |
| | | ||||||
* | | Py3: fix http2 bytes issue | Shadab Zafar | 2016-06-15 | 2 | -3/+3 | |
| | | ||||||
* | | Merge pull request #1257 from tdickers/master | Maximilian Hils | 2016-06-14 | 2 | -4/+7 | |
|\ \ | | | | | | | Make har_extractor.py output HAR 1.2 spec-compliant | |||||
| * | | Make har_extractor.py output HAR 1.2 spec-compliant | Tai Dickerson | 2016-06-14 | 2 | -4/+7 | |
|/ / | | | | | | | | | | | | | | | HAR files were failing to load in harviewer (http://www.softwareishard.com/har/viewer/) due to: - ISO 8601 dates for startedDateTime missing timezone (http://www.softwareishard.com/blog/har-12-spec/#pages) -- Used UTC but could add detection of default system timezone if desired - pages object missing pageTimings (http://www.softwareishard.com/blog/har-12-spec/#pageTimings) -- Used {} because all child fields are optional | |||||
* | | Merge pull request #1253 from mhils/fix-debug | Aldo Cortesi | 2016-06-14 | 2 | -3/+9 | |
|\ \ | | | | | | | Fix Debug Mode on Windows | |||||
| * | | fix debug mode on Windows | Maximilian Hils | 2016-06-13 | 2 | -3/+9 | |
| |/ | ||||||
* | | Merge pull request #1251 from cortesi/netlibrace | Aldo Cortesi | 2016-06-14 | 6 | -324/+337 | |
|\ \ | | | | | | | Roll connect handlers and thread leak detection out in more of the netlib test suite | |||||
| * \ | Merge branch 'master' into netlibrace | Aldo Cortesi | 2016-06-14 | 16 | -34/+63 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1254 from mitmproxy/scriptargs | Aldo Cortesi | 2016-06-14 | 16 | -34/+63 | |
|\ \ \ | |_|/ |/| | | Inline Scripts: use sys.argv instead of args argument. | |||||
| * | | Don't fail when start() is not defined | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | update examples, tests, docs | Maximilian Hils | 2016-06-13 | 15 | -32/+39 | |
| | | | ||||||
| * | | 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 Python3 tests | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'netlibrace' of github.com:cortesi/mitmproxy into netlibrace | Aldo Cortesi | 2016-06-14 | 0 | -0/+0 | |
| |\ | ||||||
| | * | Use handlers in http2 test suite | Aldo Cortesi | 2016-06-14 | 1 | -100/+100 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'upstream/master' into netlibrace | Aldo Cortesi | 2016-06-14 | 1 | -55/+83 | |
| | |\ | |_|/ |/| | | ||||||
| | * | Start rolling out leak detection in netlib | Aldo Cortesi | 2016-06-12 | 5 | -224/+237 | |
| | | | ||||||
| * | | Satisfy lint | Aldo Cortesi | 2016-06-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Use handlers in http2 test suite | Aldo Cortesi | 2016-06-14 | 1 | -100/+100 | |
| | | | ||||||
| * | | Start rolling out leak detection in netlib | Aldo Cortesi | 2016-06-14 | 5 | -224/+237 | |
|/ / | ||||||
* | | Merge pull request #1242 from Kriechi/fix-1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 | |
|\ \ | |/ |/| | fix #1240 | |||||
| * | fix #1240 | Thomas Kriechbaumer | 2016-06-12 | 1 | -55/+83 | |
|/ | ||||||
* | Merge pull request #1247 from cortesi/appveyor | Aldo Cortesi | 2016-06-12 | 3 | -43/+62 | |
|\ | | | | | Be stricter about handling connetcts in the pathoc test suite | |||||
| * | Merge branch 'master' into appveyor | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1246 from cortesi/version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
|\ \ | | | | | | | Fold mitmproxy.version and pathod.version into netlib.version | |||||
| * | | Fold mitmproxy.version and pathod.version into netlib.version | Aldo Cortesi | 2016-06-12 | 16 | -51/+34 | |
|/ / | ||||||
| * | Make the tcp connection closer cancellable | Aldo Cortesi | 2016-06-12 | 2 | -42/+55 | |
| | | | | | | | | And use this to make pathoc error handling more sophisticated |