Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fixing lint | kira0204 | 2018-03-07 | 1 | -3/+3 | |
| | | ||||||
| * | using asserts | kira0204 | 2018-03-07 | 1 | -0/+3 | |
| | | ||||||
| * | wrong additions | kira0204 | 2018-03-06 | 2 | -3/+22 | |
| | | | | | | | | | | | | | | | | | | | | test-for-2850 few fixes mock testing Typo error | |||||
* | | fix docstring | Thomas Kriechbaumer | 2018-03-10 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #2985 from hcbarry/master | Thomas Kriechbaumer | 2018-03-10 | 1 | -4/+4 | |
|\ \ | | | | | | | events.py typo fix | |||||
| * | | Typo fix | Barry Lee | 2018-03-10 | 1 | -4/+4 | |
|/ / | ||||||
* | | Merge pull request #2977 from mitmproxy/updocs2 | Aldo Cortesi | 2018-03-08 | 11 | -429/+324 | |
|\ \ | | | | | | | Revamp CI generation of snapshots and documentation | |||||
| * | | release: fix PR detection for appveyor | Aldo Cortesi | 2018-03-08 | 1 | -1/+3 | |
| | | | ||||||
| * | | release: put branches in /branches on the snapshots server | Aldo Cortesi | 2018-03-08 | 1 | -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 repo | Aldo Cortesi | 2018-03-08 | 1 | -3/+2 | |
| | | | ||||||
| * | | release: don't upload assets for PRs from the main repo | Aldo Cortesi | 2018-03-08 | 2 | -1/+16 | |
| | | | ||||||
| * | | release: clean rtool | Aldo Cortesi | 2018-03-07 | 1 | -79/+0 | |
| | | | ||||||
| * | | docs: cloudfront invalidation | Aldo Cortesi | 2018-03-07 | 3 | -8/+8 | |
| | | | ||||||
| * | | release: build wheel | Aldo Cortesi | 2018-03-07 | 3 | -15/+12 | |
| | | | ||||||
| * | | release: shift appveyor to new process | Aldo Cortesi | 2018-03-07 | 4 | -52/+47 | |
| | | | | | | | | | | | | In the process also move to InstallBuilder 18.2 | |||||
| * | | release: satisfy lint | Aldo Cortesi | 2018-03-07 | 1 | -30/+1 | |
| | | | ||||||
| * | | release: cleanup and re-enable all our Travis tests | Aldo Cortesi | 2018-03-07 | 2 | -36/+33 | |
| | | | | | | | | | | | | Wheels are yet to come. | |||||
| * | | release: revamped release upload process | Aldo Cortesi | 2018-03-07 | 7 | -300/+280 | |
| | | | ||||||
| * | | docs: enable upload to docs.mitmproxy.org/master | Aldo Cortesi | 2018-03-07 | 3 | -33/+49 | |
| | | | ||||||
* | | | Merge pull request #2968 from Oliver-Fish/arch-aur-googlechrome | Aldo Cortesi | 2018-03-07 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | Added Support for AUR Google Chrome | |||||
| * | | Added Support for AUR Google Chrome | Oliver Fish | 2018-03-07 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #2961 from fenilgandhi/PR-2957 | Aldo Cortesi | 2018-03-06 | 4 | -5/+5 | |
|\ \ | | | | | | | Update remaining old docs url with new ones. | |||||
| * | | Fix for failing UI test | Fenil Gandhi | 2018-03-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update remaining old docs url with new one. | Fenil Gandhi | 2018-03-05 | 5 | -6/+6 | |
| | | | ||||||
* | | | Merge pull request #2955 from cortesi/ndocs | Aldo Cortesi | 2018-03-06 | 9 | -16/+66 | |
|\ \ \ | |/ / |/| | | docs: start move to docs.mitmproxy.org | |||||
| * | | docs: add robots.txt and error.html | Aldo Cortesi | 2018-03-05 | 4 | -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 scripts | Aldo Cortesi | 2018-03-05 | 4 | -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 source | Aldo Cortesi | 2018-03-05 | 2 | -15/+11 | |
| | | | ||||||
* | | | Merge pull request #2957 from kira0204/patch-1 | Thomas Kriechbaumer | 2018-03-05 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | updating README according to recent doc updates | |||||
| * | | updating README according to recent doc updates | Arushit Mudgal | 2018-03-05 | 1 | -2/+2 | |
|/ / | | | | | | | | | Hi, The installation instructions linked back to old docs website. I have updated the same | |||||
* | | Merge pull request #2949 from Kriechi/docs-protocols | Aldo Cortesi | 2018-03-05 | 1 | -0/+93 | |
|\ \ | | | | | | | docs: add protocols description | |||||
| * | | docs: add protocols description | Thomas Kriechbaumer | 2018-03-03 | 1 | -0/+93 | |
| | | | ||||||
* | | | Merge pull request #2945 from kajojify/shortening | Aldo Cortesi | 2018-03-05 | 3 | -2/+63 | |
|\ \ \ | | | | | | | | | Polite shortening of statusbar messages. Fix #1433 | |||||
| * | | | Minor fixes. | Miroslav | 2018-03-03 | 2 | -18/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming prep_message method to shorten_message. Docstring. \u2026 instead of .... max_width parameter. | |||||
| * | | | Addition to the comment | Miroslav | 2018-03-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Finalization of tests. Conditions rewritten again. | Miroslav | 2018-03-02 | 3 | -27/+35 | |
| | | | | ||||||
| * | | | Initial tests. New conditions. | Miroslav | 2018-03-01 | 2 | -20/+39 | |
| | | | | ||||||
| * | | | Shortening notifications in statusbar | Miroslav | 2018-02-28 | 2 | -2/+33 | |
| | | | | ||||||
* | | | | Merge pull request #2868 from kira0204/data-crash | Maximilian Hils | 2018-03-04 | 2 | -7/+4 | |
|\ \ \ \ | | | | | | | | | | | Fix crashing when editing form with random data, fix #2794 | |||||
| * | | | | 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 | |||||
| * | | | | | 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 | |||||
| * | | | | | 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 | |||||
| * | | | | | 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 |