| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2868 from kira0204/data-crash | Maximilian Hils | 2018-03-04 | 2 | -7/+4 |
| |\ | |||||
| | * | Testing | kira0204 | 2018-02-19 | 2 | -5/+2 |
| | * | Fixing getter | kira0204 | 2018-02-19 | 1 | -1/+1 |
| | * | Adding test | kira0204 | 2018-02-16 | 1 | -1/+1 |
| | * | fix 2794 | kira0204 | 2018-02-15 | 1 | -1/+1 |
| * | | Merge pull request #2946 from fenilgandhi/master | Maximilian Hils | 2018-03-04 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Fix for wrapping up extra-long urls in flowdetailview | Fenil Gandhi | 2018-03-03 | 1 | -1/+3 |
| * | | | Merge pull request #2948 from Kriechi/docs-sidebar-height | Maximilian Hils | 2018-03-04 | 1 | -1/+0 |
| |\ \ \ | |||||
| | * | | | render sidebar without height limit | Thomas Kriechbaumer | 2018-03-03 | 1 | -1/+0 |
| | |/ / | |||||
| * | | | Merge pull request #2947 from Kriechi/docs-sidebar-color | Maximilian Hils | 2018-03-04 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | make sidebar visually distinct | Thomas Kriechbaumer | 2018-03-03 | 1 | -0/+4 |
| | |/ / | |||||
| * | | | Merge pull request #2950 from mitmproxy/certstore-path | Maximilian Hils | 2018-03-04 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | fix display inconsistency for certstore path | Maximilian Hils | 2018-03-03 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2944 from Kriechi/docs++ | Aldo Cortesi | 2018-03-03 | 1 | -0/+28 |
| |\ \ | |||||
| | * | | readd Wireshark SSL master secrets docs | Thomas Kriechbaumer | 2018-03-02 | 1 | -0/+28 |
| |/ / | |||||
| * | | Merge pull request #2943 from mitmproxy/requires-io-master | Aldo Cortesi | 2018-03-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | [requires.io] dependency update | requires.io | 2018-03-02 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2934 from mhils/cleanup-proxyconfig | Maximilian Hils | 2018-02-27 | 7 | -56/+40 |
| |\ \ | |||||
| | * | | clean up ProxyConfig | Maximilian Hils | 2018-02-27 | 6 | -56/+39 |
| | * | | add missing client_certs directory expansion | Maximilian Hils | 2018-02-27 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2931 from cortesi/scriptpath | Aldo Cortesi | 2018-02-27 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | script.run takes a path argument | Aldo Cortesi | 2018-02-27 | 1 | -1/+2 |
| * | | | Merge pull request #2875 from fenilgandhi/issue-2872 | Aldo Cortesi | 2018-02-27 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | Merge branch 'master' into issue-2872 | ColdFire | 2018-02-23 | 4 | -4/+40 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into issue-2872 | ColdFire | 2018-02-23 | 213 | -4075/+13031 |
| | |\ \ \ | |||||
| | * | | | | Fixed a bug with bytes encoding error | Fenil Gandhi | 2018-02-19 | 1 | -1/+1 |
| * | | | | | Merge pull request #2926 from cortesi/coreopts | Aldo Cortesi | 2018-02-27 | 17 | -195/+124 |
| |\ \ \ \ \ | |||||
| | * | | | | | Start consolidating core options | Aldo Cortesi | 2018-02-26 | 17 | -195/+124 |
| * | | | | | | Merge pull request #2925 from mhils/clientcert-from-sni | Aldo Cortesi | 2018-02-26 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | use sni to select clientcerts | Maximilian Hils | 2018-02-25 | 1 | -1/+2 |
| * | | | | | | | Merge pull request #2924 from cortesi/dumperfilt | Aldo Cortesi | 2018-02-26 | 5 | -20/+18 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Split dumper_filter off from view_filter | Aldo Cortesi | 2018-02-26 | 5 | -20/+18 |
| * | | | | | | | Merge pull request #2923 from cortesi/moreopts | Aldo Cortesi | 2018-02-26 | 13 | -35/+44 |
| |\| | | | | | | |||||
| | * | | | | | | Revamp verbosity options | Aldo Cortesi | 2018-02-26 | 12 | -28/+36 |
| | * | | | | | | Shift option help styling admonition into the appropriate Loader docstring | Aldo Cortesi | 2018-02-26 | 2 | -7/+8 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #2921 from fristonio/Fix-2899 | Aldo Cortesi | 2018-02-26 | 1 | -2/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove h11 from dependencies and move requests to dev dependencies | Deepesh Pathak | 2018-02-26 | 1 | -2/+1 |
| * | | | | | | | Merge pull request #2922 from kajojify/new_example | Aldo Cortesi | 2018-02-26 | 3 | -18/+10 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Getting rid of Pillow | Miroslav | 2018-02-25 | 1 | -2/+1 |
| | * | | | | | | Replace upsidedown with mirror reflection | Miroslav | 2018-02-25 | 2 | -16/+9 |
| * | | | | | | | update doc location | Thomas Kriechbaumer | 2018-02-25 | 1 | -2/+2 |
| * | | | | | | | Merge pull request #2920 from kira0204/docs-2913 | Maximilian Hils | 2018-02-25 | 9 | -8/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | trans-1 update | kira0204 | 2018-02-25 | 1 | -0/+0 |
| | * | | | | | | | few more fixes,picture mod | kira0204 | 2018-02-25 | 9 | -8/+8 |
| * | | | | | | | | improve release instructions | Thomas Kriechbaumer | 2018-02-25 | 1 | -0/+5 |
| * | | | | | | | | improve release instructions | Thomas Kriechbaumer | 2018-02-25 | 2 | -6/+19 |
| * | | | | | | | | update release instructions | Thomas Kriechbaumer | 2018-02-25 | 1 | -0/+12 |
| | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #2919 from fristonio/Fix-2906 | Maximilian Hils | 2018-02-25 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix --socks option deprecated info in command line args check. | Deepesh Pathak | 2018-02-25 | 1 | -2/+3 |
| * | | | | | | | | Merge pull request #2909 from fristonio/Fix-2867 | Aldo Cortesi | 2018-02-25 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |