aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: enable upload to docs.mitmproxy.org/masterAldo Cortesi2018-03-073-33/+49
|
* 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
| | | |
* | | | Merge pull request #2946 from fenilgandhi/masterMaximilian Hils2018-03-041-1/+3
|\ \ \ \ | | | | | | | | | | Fix for wrapping up extra-long urls in flowdetailview
| * | | | Fix for wrapping up extra-long urls in flowdetailviewFenil Gandhi2018-03-031-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #2948 from Kriechi/docs-sidebar-heightMaximilian Hils2018-03-041-1/+0
|\ \ \ \ | | | | | | | | | | render sidebar without height limit
| * | | | render sidebar without height limitThomas Kriechbaumer2018-03-031-1/+0
| |/ / /
* | | | Merge pull request #2947 from Kriechi/docs-sidebar-colorMaximilian Hils2018-03-041-0/+4
|\ \ \ \ | | | | | | | | | | make sidebar visually distinct
| * | | | make sidebar visually distinctThomas Kriechbaumer2018-03-031-0/+4
| |/ / /
* | | | Merge pull request #2950 from mitmproxy/certstore-pathMaximilian Hils2018-03-041-1/+1
|\ \ \ \ | |/ / / |/| | | Fix display inconsistency for certstore path
| * | | fix display inconsistency for certstore pathMaximilian Hils2018-03-031-1/+1
|/ / /
* | | Merge pull request #2944 from Kriechi/docs++Aldo Cortesi2018-03-031-0/+28
|\ \ \ | | | | | | | | readd Wireshark SSL master secrets docs
| * | | readd Wireshark SSL master secrets docsThomas Kriechbaumer2018-03-021-0/+28
|/ / /
* | | Merge pull request #2943 from mitmproxy/requires-io-masterAldo Cortesi2018-03-031-1/+1
|\ \ \ | | | | | | | | [requires.io] dependency update on master branch
| * | | [requires.io] dependency updaterequires.io2018-03-021-1/+1
|/ / /
* | | Merge pull request #2934 from mhils/cleanup-proxyconfigMaximilian Hils2018-02-277-56/+40
|\ \ \ | |_|/ |/| | Cleanup ProxyConfig
| * | clean up ProxyConfigMaximilian Hils2018-02-276-56/+39
| | | | | | | | | | | | | | | some of these options weren't even used anymore, others only in one place where it makes sense to use options directly.
| * | add missing client_certs directory expansionMaximilian Hils2018-02-271-0/+1
|/ /
* | Merge pull request #2931 from cortesi/scriptpathAldo Cortesi2018-02-271-1/+2
|\ \ | | | | | | script.run takes a path argument
| * | script.run takes a path argumentAldo Cortesi2018-02-271-1/+2
| | | | | | | | | | | | This must have slipped through in the first conversion.
* | | Merge pull request #2875 from fenilgandhi/issue-2872Aldo Cortesi2018-02-271-1/+1
|\ \ \ | |/ / |/| | Fixed a bug with bytes encoding error
| * | Merge branch 'master' into issue-2872ColdFire2018-02-234-4/+40
| |\ \
| * \ \ Merge branch 'master' into issue-2872ColdFire2018-02-23213-4075/+13031
| |\ \ \
| * | | | Fixed a bug with bytes encoding errorFenil Gandhi2018-02-191-1/+1
| | | | |
* | | | | Merge pull request #2926 from cortesi/coreoptsAldo Cortesi2018-02-2717-195/+124
|\ \ \ \ \ | | | | | | | | | | | | Start consolidating core options
| * | | | | Start consolidating core optionsAldo Cortesi2018-02-2617-195/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparatory patch that paves the way to consolidating our core options in the core addon. It amalgamates the core_option_validation and core addons, prepares the test suite for a world where options live in core, and moves over two trivial options as a trial balloon. From here, things will get harder, but at the end of the process we'll have a core that's responsive to options.
* | | | | | Merge pull request #2925 from mhils/clientcert-from-sniAldo Cortesi2018-02-261-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use sni to select clientcerts
| * | | | | | use sni to select clientcertsMaximilian Hils2018-02-251-1/+2
| | | | | | |
* | | | | | | Merge pull request #2924 from cortesi/dumperfiltAldo Cortesi2018-02-265-20/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Split dumper_filter off from view_filter
| * | | | | | Split dumper_filter off from view_filterAldo Cortesi2018-02-265-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These don't even do the same thing.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 06:11:37 +0000