aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #600 from elitest/print-bracket-fixMaximilian Hils2015-05-318-12/+12
|\
| * reverting change in libmproxy/contrib/pyparsing.pyJim Shaver2015-05-311-1/+1
| * revert changes in ncontribJim Shaver2015-05-312-21/+21
| * Merge remote-tracking branch 'upstream/master' into print-bracket-fixJim Shaver2015-05-31200-10425/+74185
| |\ | |/ |/|
* | fix #599Maximilian Hils2015-05-311-5/+5
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-31122-1006/+8494
|\ \
| * | Add coding style check, reformat.Aldo Cortesi2015-05-30102-856/+1641
| * | Ensure that flow/view state is consistent.Aldo Cortesi2015-05-291-2/+3
| * | Post-release version bump, and checklist addition.Aldo Cortesi2015-05-262-1/+4
| * | release: include resources PyInstaller doesn't record in spec files.Aldo Cortesi2015-05-253-0/+12
| * | docs: widen sidebarAldo Cortesi2015-05-251-3/+3
| * | docs: don't show un-necessary collapse target on mobileAldo Cortesi2015-05-242-13/+3
| * | docs: styles now live in www.mitproxy.org repo, make images responsiveAldo Cortesi2015-05-2410-77/+83
| * | docs: adjust for countershape changesAldo Cortesi2015-05-242-43/+52
| * | Move websitelayout to website.Aldo Cortesi2015-05-232-58/+1
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-235-9/+6716
| |\ \
| | * | docs: bootstrap theme + logoAldo Cortesi2015-05-224-6/+6713
| | * | Merge pull request #591 from Kriechi/autoenv-improvementsMaximilian Hils2015-05-211-3/+3
| | |\ \
| | | * | improve autoenv scriptThomas Kriechbaumer2015-05-211-3/+3
| | |/ /
| * / / doc: fix nav in website modeAldo Cortesi2015-05-221-3/+3
| |/ /
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-201-1/+1
| |\ \
| * | | docs: first-pass conversion to bootstrap3Aldo Cortesi2015-05-206-55/+87
* | | | add bench tool for windowsMaximilian Hils2015-05-312-1/+1
| |/ / |/| |
* | | Update CHANGELOGMaximilian Hils2015-05-181-1/+1
|/ /
* | certificate docs: reorg, wording, tweaksAldo Cortesi2015-05-1811-67/+78
* | Merge branch 'ssldocs' of https://github.com/elitest/mitmproxy into elitest-s...Aldo Cortesi2015-05-1818-331/+125
|\ \
| * | Added on page documentationJim Shaver2015-04-111-14/+21
| * | Minor reorg and add link for Chrome on LinuxJim Shaver2015-04-101-2/+7
| * | Cleaned up wrapping and added links to external CA instructions.Jim Shaver2015-04-071-40/+36
| * | Merge branch 'master' of github.com:mitmproxy/mitmproxy into ssldocsJim Shaver2015-03-199-212/+314
| |\ \
| * | | now actually tracking ssl.htmlJim Shaver2015-03-181-0/+113
| * | | Merge remote-tracking branch 'upstream/master'Jim Shaver2015-03-182-2/+2
| |\ \ \
| * | | | consolidated down all SSL documentation into one documentJim Shaver2015-03-186-109/+3
| * | | | Better englishJim Shaver2015-03-171-1/+1
| * | | | Removes all of the platform specific certificate installation instructions.Jim Shaver2015-03-1715-224/+3
* | | | | Merge pull request #584 from dlethin/feature/http_1_0Aldo Cortesi2015-05-181-1/+2
|\ \ \ \ \
| * | | | | Make sure proxy returns the httpversion specified in the request ratherDoug Lethin2015-05-151-1/+2
* | | | | | 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
| |\| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-15 15:18:59 +0000