aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #585 from TearsDontFalls/masterAldo Cortesi2015-05-181-1/+1
|\
| * docs: Single Qoute for ignore pattern with "!"TearsDontFalls2015-05-161-1/+1
* | Release pep: bump version, changelog, contributorsAldo Cortesi2015-05-183-33/+96
|/
* docs: add parantheses for ignore parameters.Maximilian Hils2015-05-101-4/+4
* Merge pull request #576 from nickraptis/req-ts-startMaximilian Hils2015-05-081-0/+5
|\
| * Accurately timestamp start of requestNick Raptis2015-05-081-0/+5
|/
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-031-25/+71
|\
| * Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-023-10/+19
| |\
| * | check in last attempt at contenteditable before retreating to inputsMaximilian Hils2015-05-021-25/+71
* | | Adapt to new literal escaping style in pathodAldo Cortesi2015-05-031-3/+1
| |/ |/|
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-028-1578/+1962
|\|
| * web: try harder to fix editorMaximilian Hils2015-05-012-4/+14
| * Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-017-31/+16
| |\
| * | mitmweb: add editorMaximilian Hils2015-05-018-1578/+1952
* | | Adapt to new Pathoc API - silence output to stdout.Aldo Cortesi2015-05-023-10/+19
| |/ |/|
* | pretty_size now lives in netlib.utilsAldo Cortesi2015-04-307-31/+16
|/
* Merge pull request #569 from mike-pt/masterMaximilian Hils2015-04-272-4/+4
|\
| * + Use sys.platform.startswith("freebsd") instead of matching just freebsd10.Mike C2015-04-272-4/+4
* | improve docs for win installMaximilian Hils2015-04-261-12/+18
* | Merge pull request #555 from elitest/userinstalldocsMaximilian Hils2015-04-262-32/+46
|\ \
| * | Re-org and added platform specific install from source docs, refs: mitmproxy/...Jim Shaver2015-04-251-30/+34
| * | Moved installing from Source to the bottom.Jim Shaver2015-04-211-18/+18
| * | Removed logging out added setting variables manually.Jim Shaver2015-04-111-2/+2
| * | added the most important part of "sudo apt-get install ..." to the docsJim Shaver2015-04-111-1/+1
| * | Removed mitmweb referrences and added On This Page sectionJim Shaver2015-04-111-10/+15
| * | cleaned up Installing from source section.Jim Shaver2015-04-111-18/+9
| * | Fixed image name and moved it into the screenshots folderJim Shaver2015-04-111-0/+0
| * | Fixed english and made each OS consistentJim Shaver2015-04-112-12/+6
| * | Cleaned up Ubuntu docs and added Windows installation informationJim Shaver2015-04-112-14/+34
* | | make code more pythonicMaximilian Hils2015-04-261-8/+11
* | | Merge remote-tracking branch 'tunz/crash1'Maximilian Hils2015-04-261-4/+11
|\ \ \
| * | | Fix crash when save to clipboard before loadingChoongwoo Han2015-04-231-4/+11
* | | | remove superfluous set_focusMaximilian Hils2015-04-261-2/+0
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-264-113/+91
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #561 from tunz/overwriteMaximilian Hils2015-04-231-2/+20
| |\ \ \ | | |/ / | |/| |
| | * | Check overwrite, when save to file instaed of clipboardChoongwoo Han2015-04-231-2/+20
| |/ /
| * | python2 -> python in ./devAldo Cortesi2015-04-211-2/+2
| * | Missed some un-needed variable declarationsAldo Cortesi2015-04-211-3/+1
| * | HTTP request reading moves to netlibAldo Cortesi2015-04-211-105/+64
| * | Fudge a rare race condition in the test suiteAldo Cortesi2015-04-191-1/+4
* | | fix #568Maximilian Hils2015-04-262-2/+3
|/ /
* | console: make g/G shortcuts work in more contextsAldo Cortesi2015-04-173-2/+15
* | console: more consistent view stack managementAldo Cortesi2015-04-171-40/+55
* | console: suport unary attributesAldo Cortesi2015-04-173-28/+66
* | console: refactor grideditor, fix a crash on tab for subeditorsAldo Cortesi2015-04-161-59/+52
* | Adjust header key color in solarized palettesAldo Cortesi2015-04-161-2/+2
* | console: first pass of a Set-cookie editor for responsesAldo Cortesi2015-04-163-66/+196
* | console: add a -l flag to set the limit on startupAldo Cortesi2015-04-154-0/+16
* | Adjust for ODict interface changeAldo Cortesi2015-04-153-4/+4
* | Editor for request cookiesAldo Cortesi2015-04-152-21/+53