aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update cut.pyjplochocki2018-03-181-1/+1
| | | Line 132: cut.clip command always copy "utf-8" when single cut specified (ie :cut.clip @focus request.method gets "utf-8")
* Merge pull request #2991 from fenilgandhi/Fix-2990Maximilian Hils2018-03-151-4/+2
|\ | | | | Removing the erroneously highlighted keybinding
| * 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
|\ | | | | Test for #2850
| * 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
| | | | | | | | | | | | | | | | | | | | test-for-2850 few fixes mock testing Typo error
* | fix docstringThomas Kriechbaumer2018-03-101-1/+1
| |
* | Merge pull request #2985 from hcbarry/masterThomas Kriechbaumer2018-03-101-4/+4
|\ \ | | | | | | events.py typo fix
| * | Typo fixBarry Lee2018-03-101-4/+4
|/ /
* | Merge pull request #2977 from mitmproxy/updocs2Aldo Cortesi2018-03-0811-429/+324
|\ \ | | | | | | Revamp CI generation of snapshots and documentation
| * | 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
| | | | | | | | | | | | | | | | | | This is a precautionary measure to prevent a clash in case we have a branch with the same name as a tag. Tags live in the top-level directory, because these are releases that users will most often access directly.
| * | 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
| | | | | | | | | | | | In the process also move to InstallBuilder 18.2
| * | release: satisfy lintAldo Cortesi2018-03-071-30/+1
| | |
| * | release: cleanup and re-enable all our Travis testsAldo Cortesi2018-03-072-36/+33
| | | | | | | | | | | | Wheels are yet to come.
| * | 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 Chrome
| * | Added Support for AUR Google ChromeOliver Fish2018-03-071-0/+1
|/ /
* | Merge pull request #2961 from fenilgandhi/PR-2957Aldo Cortesi2018-03-064-5/+5
|\ \ | | | | | | Update remaining old docs url with new ones.
| * | 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: start move to docs.mitmproxy.org
| * | docs: add robots.txt and error.htmlAldo Cortesi2018-03-054-1/+19
| | | | | | | | | | | | | | | | | | - robots.txt prevents crawling of everything but /stable - error.html has a simple meta refresh to the latest stable docs. This will also help crawlers find the right path.
| * | docs: add build and upload scriptsAldo Cortesi2018-03-054-0/+36
| | | | | | | | | | | | | | | | | | The upload scripts might be unified down the track, or might not. CloudFront is not set up for the docs bucket yet, so CDN invalidation is commented out. This will be added later.
| * | 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 updates
| * | updating README according to recent doc updatesArushit Mudgal2018-03-051-2/+2
|/ / | | | | | | | | Hi, The installation instructions linked back to old docs website. I have updated the same
* | Merge pull request #2949 from Kriechi/docs-protocolsAldo Cortesi2018-03-051-0/+93
|\ \ | | | | | | docs: add protocols description
| * | docs: add protocols descriptionThomas Kriechbaumer2018-03-031-0/+93
| | |
* | | Merge pull request #2945 from kajojify/shorteningAldo Cortesi2018-03-053-2/+63
|\ \ \ | | | | | | | | Polite shortening of statusbar messages. Fix #1433
| * | | Minor fixes.Miroslav2018-03-032-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming prep_message method to shorten_message. Docstring. \u2026 instead of .... max_width parameter.
| * | | 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
|\ \ \ \ | | | | | | | | | | Fix crashing when editing form with random data, fix #2794
| * | | | Testingkira02042018-02-192-5/+2
| | | | |
| * | | | Fixing getterkira02042018-02-191-1/+1
| | | | |
| * | | | Adding testkira02042018-02-161-1/+1
| | | | |
| * | | | fix 2794kira02042018-02-151-1/+1
| | | | |