aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | minor improvementsMaximilian Hils2018-03-181-1/+1
| * | Remove Highlight from statusbarFenil Gandhi2018-03-191-3/+1
|/ /
* | Merge pull request #2997 from jplochocki/patch-1Maximilian Hils2018-03-181-1/+1
|\ \ | |/ |/|
| * Update cut.pyjplochocki2018-03-181-1/+1
|/
* Merge pull request #2991 from fenilgandhi/Fix-2990Maximilian Hils2018-03-151-4/+2
|\
| * Fixing the Fix for #2990Fenil Gandhi2018-03-151-0/+2
| * Removing the erroneously highlighted keybindingFenil Gandhi2018-03-151-4/+0
|/
* Merge pull request #2956 from kira0204/test-for-2850Maximilian Hils2018-03-152-3/+33
|\
| * adding commandkira02042018-03-121-3/+5
| * Testing using addonkira02042018-03-121-11/+17
| * fixing lintkira02042018-03-071-3/+3
| * using assertskira02042018-03-071-0/+3
| * wrong additionskira02042018-03-062-3/+22
* | fix docstringThomas Kriechbaumer2018-03-101-1/+1
* | Merge pull request #2985 from hcbarry/masterThomas Kriechbaumer2018-03-101-4/+4
|\ \
| * | Typo fixBarry Lee2018-03-101-4/+4
|/ /
* | Merge pull request #2977 from mitmproxy/updocs2Aldo Cortesi2018-03-0811-429/+324
|\ \
| * | release: fix PR detection for appveyorAldo Cortesi2018-03-081-1/+3
| * | release: put branches in /branches on the snapshots serverAldo Cortesi2018-03-081-1/+3
| * | release: build snapshots for all branches on the main repoAldo Cortesi2018-03-081-3/+2
| * | release: don't upload assets for PRs from the main repoAldo Cortesi2018-03-082-1/+16
| * | release: clean rtoolAldo Cortesi2018-03-071-79/+0
| * | docs: cloudfront invalidationAldo Cortesi2018-03-073-8/+8
| * | release: build wheelAldo Cortesi2018-03-073-15/+12
| * | release: shift appveyor to new processAldo Cortesi2018-03-074-52/+47
| * | release: satisfy lintAldo Cortesi2018-03-071-30/+1
| * | release: cleanup and re-enable all our Travis testsAldo Cortesi2018-03-072-36/+33
| * | release: revamped release upload processAldo Cortesi2018-03-077-300/+280
| * | docs: enable upload to docs.mitmproxy.org/masterAldo Cortesi2018-03-073-33/+49
* | | Merge pull request #2968 from Oliver-Fish/arch-aur-googlechromeAldo Cortesi2018-03-071-0/+1
|\ \ \ | |/ / |/| |
| * | Added Support for AUR Google ChromeOliver Fish2018-03-071-0/+1
|/ /
* | Merge pull request #2961 from fenilgandhi/PR-2957Aldo Cortesi2018-03-064-5/+5
|\ \
| * | Fix for failing UI testFenil Gandhi2018-03-061-1/+1
| * | Update remaining old docs url with new one.Fenil Gandhi2018-03-055-6/+6
* | | Merge pull request #2955 from cortesi/ndocsAldo Cortesi2018-03-069-16/+66
|\ \ \ | |/ / |/| |
| * | docs: add robots.txt and error.htmlAldo Cortesi2018-03-054-1/+19
| * | docs: add build and upload scriptsAldo Cortesi2018-03-054-0/+36
| * | docs: port changes in .css to .scss sourceAldo Cortesi2018-03-052-15/+11
* | | Merge pull request #2957 from kira0204/patch-1Thomas Kriechbaumer2018-03-051-2/+2
|\ \ \ | |/ / |/| |
| * | updating README according to recent doc updatesArushit Mudgal2018-03-051-2/+2
|/ /
* | Merge pull request #2949 from Kriechi/docs-protocolsAldo Cortesi2018-03-051-0/+93
|\ \
| * | docs: add protocols descriptionThomas Kriechbaumer2018-03-031-0/+93
* | | Merge pull request #2945 from kajojify/shorteningAldo Cortesi2018-03-053-2/+63
|\ \ \
| * | | Minor fixes.Miroslav2018-03-032-18/+21
| * | | Addition to the commentMiroslav2018-03-031-1/+1
| * | | Finalization of tests. Conditions rewritten again.Miroslav2018-03-023-27/+35
| * | | Initial tests. New conditions.Miroslav2018-03-012-20/+39
| * | | Shortening notifications in statusbarMiroslav2018-02-282-2/+33
* | | | Merge pull request #2868 from kira0204/data-crashMaximilian Hils2018-03-042-7/+4
|\ \ \ \
| * | | | Testingkira02042018-02-192-5/+2