Maximilian Hils
52d696df3d
fix ssl shutdown in tcp mode, refs #464
2015-02-05 16:46:55 +01:00
Maximilian Hils
310fb18aac
fix #464
2015-02-05 15:24:32 +01:00
Maximilian Hils
0ac3227b7b
clean up flow reading
2015-02-05 14:44:45 +01:00
Maximilian Hils
19555bb39a
Merge remote-tracking branch 'tekii/master'
2015-02-05 14:20:22 +01:00
Maximilian Hils
965cfffa5e
fix statusbar initialization
2015-02-05 14:15:26 +01:00
Marcelo Glezer
8e57597d22
missing parameter in start_server_playback call
2015-01-13 08:16:00 -03:00
Marcelo Glezer
4f578866fa
open flow files using with as max suggested
2015-01-12 14:31:18 -03:00
Marcelo Glezer
9553ca0ed4
hotfix to mitmproxy missing start_server_playback() parameter added. backported from PR [ #439 ]
2015-01-12 12:49:23 -03:00
Marcelo Glezer
27950f1972
Merge remote-tracking branch 'base/master'
2015-01-12 10:55:47 -03:00
Maximilian Hils
e18294437c
document choice of timeout value, refs #443
2015-01-09 17:17:12 +01:00
Maximilian Hils
40c28b79d1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-01-09 16:40:32 +01:00
Maximilian Hils
8af26bd0b7
fix #443
2015-01-09 16:40:26 +01:00
Nick HS
3dcba41d6d
Error to stdout when loading bad replays from the command line
2015-01-08 13:56:19 -05:00
Marcelo Glezer
30213d6370
now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter)
2015-01-06 15:49:49 -03:00
Marcelo Glezer
9695377b28
first steps in scenario support
2015-01-05 18:12:38 -03:00
Aldo Cortesi
1959aebc08
Add PEG support to gulpfile
...
- Extract conf - all project specific conf outside gulpfile
- Generalize filt.js exports, add required imports
2015-01-03 11:46:51 +13:00
Aldo Cortesi
80339aef93
Unit test framework for web client-side code
...
- Also make formatSize nicer and test it.
Now there's no excuse! ;)
2015-01-02 15:29:51 +13:00
Aldo Cortesi
b14b4ace25
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-01-02 13:42:56 +13:00
Aldo Cortesi
1b5f5021dc
Consolidate reading flows from file, use in mitmweb.
2015-01-02 13:26:22 +13:00
Maximilian Hils
c152e5da1a
we do not support https2http in upstream proxy mode
2015-01-01 22:07:49 +01:00
Aldo Cortesi
4d01e22f26
components/utils.js -> common.js
...
Too many utils modules makes things confusing. These are more "common
components" or "common mixins" than utils anyway.
2015-01-01 20:49:32 +13:00
Aldo Cortesi
866a408120
Make header more compact
...
- Remove title bar
- File -> mitmproxy - ultimately our logo can go here
2015-01-01 20:44:45 +13:00
Aldo Cortesi
4506bafddc
Use Facebook's dispatcher
2015-01-01 16:59:58 +13:00
Aldo Cortesi
b09dbbe209
Replace custom EventEmitter with one from browserify
2015-01-01 16:41:45 +13:00
Aldo Cortesi
c9ce5094c8
All files and only files in in js/components are jsx
...
So remove the redundant naming
2015-01-01 15:37:42 +13:00
Aldo Cortesi
67f6f67c48
More browesrification.
2014-12-31 18:14:17 +13:00
Aldo Cortesi
2152d4dd92
More conversions to browserify
2014-12-30 22:12:26 +13:00
Aldo Cortesi
b847faf37f
Fix fonts, stylesheets, add much more flexible bootstrap over-rides.
2014-12-30 22:02:55 +13:00
Aldo Cortesi
bc8687deb5
Basic conversion: browserified web app now works.
2014-12-30 21:51:07 +13:00
Aldo Cortesi
e9d8586f6b
Bump for next dev iteration
2014-12-30 11:26:45 +13:00
Aldo Cortesi
089c5fd948
Bump version
2014-12-30 10:02:45 +13:00
Maximilian Hils
333688b06e
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-29 14:56:47 +01:00
Maximilian Hils
51671b22a0
fix #435
2014-12-29 14:56:35 +01:00
Maximilian Hils
ad973de0b3
fix mitmproxy -w
2014-12-29 14:40:34 +01:00
Aldo Cortesi
d33d125214
Documentation for config files
2014-12-28 22:35:14 +13:00
Aldo Cortesi
0cc8c44c22
Minor improvements to osx binary build process
...
- Add --shortversion on tools to make packaging easier
- Automate tarfile generation
2014-12-28 15:07:44 +13:00
Aldo Cortesi
ab06c2436b
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-12-27 23:08:56 +13:00
Aldo Cortesi
8a8437470e
Move onboarding app to Tornado
...
Two reasons for this. First, this removes flask and its dependencies, which are
quite sizeable. Second, pyinstaller now barfs on simplejson, which is a Flask
dependency. I just don't have time to fix this upstream, so doing what we
should be doing anyway is a no-brainer.
2014-12-27 23:06:51 +13:00
Maximilian Hils
3e63107e94
web: integrate filter docs
2014-12-26 03:10:24 +01:00
Maximilian Hils
1f454b577f
web: CSP, revert functionality, serve content
2014-12-25 16:10:47 +01:00
Maximilian Hils
4cfa91a903
web: show mitmproxy version
2014-12-25 02:08:58 +01:00
Maximilian Hils
7ed6f10e35
web: much ui work, such christmas
2014-12-25 02:03:55 +01:00
Maximilian Hils
4b94c7cf15
bump version, update release checklist
2014-12-24 02:03:14 +01:00
Maximilian Hils
1c4f4c2494
web: duplicate, delete, replay flows
2014-12-24 01:07:57 +01:00
Maximilian Hils
b1311faa68
web: move eventlog state out of settings
2014-12-23 23:23:25 +01:00
Maximilian Hils
4767b83726
fix gzipped body edit
2014-12-23 23:14:55 +01:00
Maximilian Hils
2861d99de4
web: intercept feature
2014-12-23 20:33:42 +01:00
Maximilian Hils
459772a8ef
web: squash bugs
2014-12-23 01:26:03 +01:00
Maximilian Hils
b55d584309
web: simpler filter ui
2014-12-23 01:13:34 +01:00
Maximilian Hils
d5e16d7cf1
simplify code
2014-12-23 00:30:35 +01:00
