aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3054 from Kriechi/fix-exampleAldo Cortesi2018-04-141-1/+1
|\
| * fix example filenameThomas Kriechbaumer2018-04-131-1/+1
|/
* fix GA idMaximilian Hils2018-04-111-1/+1
* Merge pull request #3035 from cortesi/aiosimplerAldo Cortesi2018-04-0735-295/+285
|\
| * asyncio: ditch the handler contextAldo Cortesi2018-04-077-54/+21
| * asyncio: remove master.add_log, in favor of a persistent log.Log instanceAldo Cortesi2018-04-076-25/+12
| * asyncio: remove test master.has_logAldo Cortesi2018-04-077-30/+40
| * asyncio: move log mechanism onto the event loopAldo Cortesi2018-04-0721-94/+128
| * asyncio simplify: we don't need a queue for proxy->main loop commsAldo Cortesi2018-04-0713-85/+83
| * asyncio: remove last vestiage of channel input from masterAldo Cortesi2018-04-073-17/+11
|/
* Merge pull request #3031 from itzikBraun/add-httpie-exportAldo Cortesi2018-04-062-4/+52
|\
| * added option to export request as httpie commanditzikBraun2018-04-022-4/+52
* | Merge pull request #2971 from kira0204/user-script-exceptionAldo Cortesi2018-04-062-6/+38
|\ \
| * | use error handler functionkira02042018-03-262-7/+7
| * | User script exception handler[squash]kira02042018-03-072-0/+32
* | | Merge pull request #3046 from cortesi/backlogAldo Cortesi2018-04-061-2/+1
|\ \ \
| * | | Remove socket listen backlog constraintAldo Cortesi2018-04-061-2/+1
|/ / /
* | | update release instructionsMaximilian Hils2018-04-051-0/+5
* | | update CHANGELOGMaximilian Hils2018-04-051-2/+14
* | | Merge pull request #3044 from mhils/issue-3038Maximilian Hils2018-04-052-52/+27
|\ \ \
| * | | fix http retry timeoutMaximilian Hils2018-04-052-52/+27
|/ / /
* | | Merge pull request #3032 from mitmproxy/requires-io-masterAldo Cortesi2018-04-051-1/+1
|\ \ \
| * | | [requires.io] dependency updaterequires.io2018-04-021-1/+1
| | |/ | |/|
* | | Merge pull request #3029 from cortesi/eventloopAldo Cortesi2018-04-0416-224/+170
|\ \ \
| * | | minor fixesAldo Cortesi2018-04-032-10/+4
| * | | asyncio: factor out test server startup waitAldo Cortesi2018-04-033-12/+7
| * | | asyncio: cleanup and lintAldo Cortesi2018-04-025-6/+10
| * | | asyncio: rebase mitmweb Tornado event loop on asyncioAldo Cortesi2018-04-021-1/+4
| * | | asyncio: test cleanupAldo Cortesi2018-04-025-8/+27
| * | | asyncio: shift console over to asyncio eventloopAldo Cortesi2018-04-022-9/+5
| * | | asyncio: make http2 tests passAldo Cortesi2018-04-023-9/+16
| * | | asyncio: fix a few remaining issues in proxy/test_server.pyAldo Cortesi2018-04-022-9/+14
| * | | asyncio: fix channel interface and testsAldo Cortesi2018-04-014-24/+33
| * | | asyncio: fix client replayAldo Cortesi2018-04-012-23/+3
| * | | asyncio: start a test loop for unit testsAldo Cortesi2018-04-016-17/+9
| * | | Remove support for Python 3.5Aldo Cortesi2018-04-011-2/+2
| * | | asyncio: clean up event loop acquisitionAldo Cortesi2018-04-012-97/+20
| * | | asyncio: brutally rip out our old queue mechanismAldo Cortesi2018-04-0110-140/+159
| |/ /
* | | Merge pull request #3033 from emilstahl/masterThomas Kriechbaumer2018-04-031-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed --no-mouse parameter messageEmil Stahl2018-04-031-1/+1
|/ /
* | Update dev.ps1Thomas Kriechbaumer2018-03-311-3/+3
* | Merge pull request #3025 from Kriechi/py36Aldo Cortesi2018-04-0111-49/+21
|\ \
| * | Python 3.5 is dead -- long live Python 3.6!Thomas Kriechbaumer2018-03-3111-49/+21
* | | Merge pull request #3026 from ghillu/masterThomas Kriechbaumer2018-03-311-2/+2
|\ \ \ | |/ / |/| |
| * | Update addons-overview.mdghillu2018-04-011-2/+2
|/ /
* | Merge pull request #3012 from Kriechi/docs-optionsAldo Cortesi2018-03-3013-65/+126
|\ \
| * | docs: add auto-generated options referenceThomas Kriechbaumer2018-03-2513-68/+115
| * | docs: add skeleton for options scriptMaximilian Hils2018-03-241-0/+14
* | | simplify READMEMaximilian Hils2018-03-281-2/+1
* | | fix badgesThomas Kriechbaumer2018-03-271-4/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:05:37 +0000