Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | simplify tox test exclusion | Thomas Kriechbaumer | 2016-07-08 | 1 | -1/+1 |
| | |||||
* | fix tests | Maximilian Hils | 2016-07-07 | 1 | -0/+1 |
| | |||||
* | tests++ | Maximilian Hils | 2016-07-07 | 2 | -1/+16 |
| | |||||
* | py3++ | Maximilian Hils | 2016-07-07 | 7 | -19/+20 |
| | |||||
* | py3++ | Maximilian Hils | 2016-07-07 | 7 | -88/+114 |
| | |||||
* | reorder travis jobs | Thomas Kriechbaumer | 2016-07-07 | 1 | -7/+7 |
| | |||||
* | Merge pull request #1325 from Kriechi/dufferzafar-py3-h2 | Thomas Kriechbaumer | 2016-07-07 | 3 | -13/+13 |
|\ | | | | | HTTP/2: Python 3-compatibility | ||||
| * | py3++ | Thomas Kriechbaumer | 2016-07-07 | 2 | -9/+9 |
| | | |||||
| * | py3++: test_protocol_http2 | Shadab Zafar | 2016-07-07 | 2 | -4/+4 |
|/ | |||||
* | py3++ | Maximilian Hils | 2016-07-07 | 4 | -4/+5 |
| | |||||
* | Merge pull request #1323 from mhils/test-examples | Maximilian Hils | 2016-07-07 | 3 | -1/+14 |
|\ | | | | | Exclude harparser script on Python 3 | ||||
| * | disable harparser on py3 | Maximilian Hils | 2016-07-07 | 3 | -1/+14 |
|/ | |||||
* | Merge pull request #1318 from mhils/tnetstring3-unicode-type | Thomas Kriechbaumer | 2016-07-07 | 14 | -278/+212 |
|\ | | | | | [tests actually pass] Add unicode to tnetstring3 | ||||
| * | sni is now str, not bytes | Maximilian Hils | 2016-07-06 | 10 | -43/+44 |
| | | |||||
| * | fix tests | Maximilian Hils | 2016-07-06 | 2 | -2/+2 |
| | | |||||
| * | fix dump file cross compat between python versions | Maximilian Hils | 2016-07-06 | 2 | -32/+61 |
| | | |||||
| * | tnetstring3: adapt to unicode support | Maximilian Hils | 2016-07-06 | 5 | -41/+66 |
| | | |||||
| * | add tnetstring unicode type | Maximilian Hils | 2016-07-06 | 6 | -750/+251 |
| | | |||||
| * | tnetstring: keys are str on py3. migrate flow.io_compat | Maximilian Hils | 2016-07-06 | 7 | -16/+20 |
| | | |||||
| * | add python3 tnetstring implementation | Maximilian Hils | 2016-07-06 | 6 | -372/+746 |
| | | |||||
* | | Merge pull request #1322 from linrock/json-api | Maximilian Hils | 2016-07-06 | 2 | -1/+11 |
|\ \ | |/ |/| | Detect JSON API media type as a json content view | ||||
| * | Detect JSON API media type as a json content view | Linmiao Xu | 2016-07-06 | 2 | -1/+11 |
|/ | | | | | | | | IANA assignment here: https://www.iana.org/assignments/media-types/application/vnd.api+json More about JSON API: https://github.com/json-api/json-api | ||||
* | py3++, multidict fixes | Maximilian Hils | 2016-07-06 | 8 | -46/+68 |
| | | | | | | | | | | | | This commit improves Python 3 compatibility and fixes two multidict issues: 1. Headers.items(multi=True) now decodes fields 2. MultiDict.clear(item) has been removed, as Python's MutableMapping already defines .clear() with different semantics. This is confusing for everyone who expects a dict-like object. `.pop("attr", None)` is not fantastic, but it's the Python way to do it. | ||||
* | Merge pull request #1319 from mitmproxy/fix-py27-encoding-issues | Maximilian Hils | 2016-07-06 | 2 | -5/+11 |
|\ | | | | | Fix pathod log encoding | ||||
| * | fix pathod log encoding | Maximilian Hils | 2016-07-06 | 2 | -5/+11 |
| | | |||||
* | | py3++ | Maximilian Hils | 2016-07-06 | 6 | -39/+26 |
|/ | |||||
* | blacklist pysftp 0.2.9 | Maximilian Hils | 2016-07-06 | 1 | -1/+1 |
| | | | https://bitbucket.org/dundeemt/pysftp/issues/97/pysftp-029-breaks-builds | ||||
* | fix issue introduced in 72f3b2b | Maximilian Hils | 2016-07-06 | 1 | -1/+1 |
| | |||||
* | minor code improvement | Maximilian Hils | 2016-07-05 | 1 | -5/+6 |
| | |||||
* | Merge branch 'dont-cache-tox' | Maximilian Hils | 2016-07-05 | 3 | -9/+2 |
|\ | |||||
| * | don't cache tox on CI | Maximilian Hils | 2016-07-05 | 3 | -9/+2 |
| | | |||||
* | | Merge pull request #1315 from mitmproxy/better-unicode-handling | Maximilian Hils | 2016-07-05 | 6 | -57/+93 |
|\ \ | |/ |/| | remove clean_bin, clarify unicode handling | ||||
| * | remove clean_bin, clarify unicode handling | Maximilian Hils | 2016-07-05 | 6 | -57/+93 |
| | | |||||
* | | Merge pull request #1316 from mhils/faster-lint | Maximilian Hils | 2016-07-05 | 1 | -2/+1 |
|\ \ | | | | | | | tox: dont make sdist when linting | ||||
| * | | tox: dont make sdist when linting | Maximilian Hils | 2016-07-05 | 1 | -2/+1 |
| |/ | |||||
* | | Merge pull request #1297 from dufferzafar/py3-flow-export | Maximilian Hils | 2016-07-05 | 5 | -26/+41 |
|\ \ | |/ |/| | Python 3 - test_flow_export | ||||
| * | py3++: test_flow_export | Shadab Zafar | 2016-07-02 | 4 | -19/+34 |
| | | |||||
| * | Replace map + lambda with list comprehensions | Shadab Zafar | 2016-07-02 | 1 | -3/+3 |
| | | |||||
| * | netlib: condition on PY2 rather than on PY3 | Shadab Zafar | 2016-07-02 | 1 | -4/+4 |
| | | | | | | | | Let's just hope PY4 doesn't break this! | ||||
* | | Merge pull request #1244 from Kriechi/http2-tests | Thomas Kriechbaumer | 2016-07-05 | 3 | -6/+134 |
|\ \ | | | | | | | http2: tests++ | ||||
| * | | http2: test fatal connection termination | Thomas Kriechbaumer | 2016-07-05 | 1 | -1/+52 |
| | | | |||||
| * | | http2: test throttling at MAX_CONCURRENT_STREAMS | Thomas Kriechbaumer | 2016-07-05 | 2 | -6/+80 |
| | | |