aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* web: fix react-routerMaximilian Hils2015-03-272-4/+8
|
* Merge remote-tracking branch 'vzvu/react-router-0.13.2'Maximilian Hils2015-03-273-7/+1
|\ | | | | | | | | Conflicts: libmproxy/web/static/vendor.js
| * web: upgrade to react-router 0.13.2vzvu3k6k2015-03-274-1430/+1754
| |
* | web: initial attempt at header editorMaximilian Hils2015-03-275-1039/+1591
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-269-28/+101
|\
| * Merge pull request #515 from krzysiekbielicki/masterMaximilian Hils2015-03-266-25/+89
| |\ | | | | | | [#514] Add support for ignoring payload params in multipart/form-data
| | * Added testsKrzysztof Bielicki2015-03-162-1/+39
| | |
| | * [#514] Add support for ignoring payload params in multipart/form-dataKrzysztof Bielicki2015-03-104-24/+50
| | |
| * | Merge pull request #538 from peralta/patch-1Maximilian Hils2015-03-261-1/+4
| |\ \ | | | | | | | | mitmweb: start onboarding app if instructed to
| | * | mitmweb: start onboarding app if instructed toperalta2015-03-261-1/+4
| |/ /
| * | Merge pull request #537 from tekii/fix530Maximilian Hils2015-03-261-0/+2
| |\ \ | | | | | | | | fix #530 set client_playback to None when client_playback is done
| | * | fix #530 set client_playback to None when client_playback is doneMarcelo Glezer2015-03-251-0/+2
| | | |
| * | | Merge pull request #536 from tekii/masterMaximilian Hils2015-03-261-1/+5
| |\ \ \ | | |/ / | |/| | fixed exception in mitmproxy -c fix #535
| | * | fix #535 server replay was failing from ui but working from command line ↵Marcelo Glezer2015-03-251-0/+2
| | | | | | | | | | | | | | | | (fixed now too)
| | * | fix #535 now works with both cases: using -c from command line and pressing ↵Marcelo Glezer2015-03-251-0/+2
| | | | | | | | | | | | | | | | c in the ui
| | * | fixed exception in mitmproxy -c fix #535Marcelo Glezer2015-03-251-1/+1
| |/ /
| * | Merge pull request #532 from tekii/masterMaximilian Hils2015-03-251-1/+1
| |\ \ | | | | | | | | handles UnicodeDecodeError (#531)
| | * | handles UnicodeDecodeErrorMarcelo Glezer2015-03-231-1/+1
| |/ /
* | | web: backup flows on editMaximilian Hils2015-03-262-0/+11
| | |
* | | web: add basic edit capability for first lineMaximilian Hils2015-03-2312-133/+757
|/ /
* | web: add content downloadMaximilian Hils2015-03-224-5/+13
| |
* | web: improve viewsMaximilian Hils2015-03-227-47/+139
| |
* | web: upgrade to react 0.13Maximilian Hils2015-03-226-4685/+6590
| |
* | Unwind twisty maze of cache layers. Holy confusing, Batman.Aldo Cortesi2015-03-221-35/+22
| |
* | Replace far-too-clever decorator LRU cache with something simplerAldo Cortesi2015-03-225-66/+47
| |
* | Whitespace, indentation, formattingAldo Cortesi2015-03-221-26/+102
| |
* | Trigger flow change when flow elements are editedAldo Cortesi2015-03-221-2/+18
| |
* | Fix unit testsAldo Cortesi2015-03-221-2/+2
| |
* | console: signal-based view stack, unifying mechanisms for help, flow views, etc.Aldo Cortesi2015-03-227-38/+35
| |
* | console: refactor the way we keep global view stateAldo Cortesi2015-03-225-66/+60
| |
* | Remove refresh_flow mechanism in favor of a signal-based implementationAldo Cortesi2015-03-223-41/+43
| |
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-225-13/+107
|\ \
| * | web: raw content viewMaximilian Hils2015-03-225-13/+107
| | |
* | | console: observe state objects for changes, fire event to update status bar.Aldo Cortesi2015-03-223-0/+16
|/ /
* | Simplify the way in which path prompts keep stateAldo Cortesi2015-03-227-26/+16
| | | | | | | | | | | | In the past, we kept the last path the user specified for a number of different path types to pre-seed the path prompt. Now, we no longer distinguish between types, and pre-seed with the last used directory regardless.
* | Rationalise prompt calling conventionsAldo Cortesi2015-03-227-52/+46
| |
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-2226-994/+1378
|\ \
| * | tweak cssMaximilian Hils2015-03-2210-157/+170
| | |
| * | web: add content viewsMaximilian Hils2015-03-227-47/+366
| | |
| * | structure componentsMaximilian Hils2015-03-219-831/+877
| | |
| * | web: fix bugsMaximilian Hils2015-03-217-13/+19
| | |
* | | Refactor status bar prompting to use signal systemAldo Cortesi2015-03-229-335/+386
| | |
* | | Status bar message expiry based on signals and Urwid main loopAldo Cortesi2015-03-214-9/+23
|/ /
* | Add blinker dependency, start using it to refactor console appAldo Cortesi2015-03-219-52/+51
| | | | | | | | | | Blinker lets us set up a central pub/sub mechanism to disentangle our object structure.
* | Add window.py import missed in refactoringAldo Cortesi2015-03-201-0/+1
| |
* | console: pull primary window frame management out into window.pyAldo Cortesi2015-03-203-148/+157
| |
* | Pull console StatusBar into its own file.Aldo Cortesi2015-03-202-182/+187
| |
* | Remove cruft to work around an old Urwid bugAldo Cortesi2015-03-201-5/+0
| |
* | Fix general prompt input.Aldo Cortesi2015-03-202-0/+11
| |
* | Pull PathEdit out into its own file.Aldo Cortesi2015-03-204-110/+119
| |