Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-02 12:01:17 +00:00
Code Issues Projects Releases Wiki Activity
5,853 Commits 1 Branch 67 Tags 50 MiB
293b79af91
Commit Graph

336 Commits

Author SHA1 Message Date
Jason
7746deedc2 [web] code format 2016-06-24 00:13:05 +08:00
Jason
b2ffa06e32 [web] fix view data structure 2016-06-24 00:10:13 +08:00
Jason
7bc479bb3a [web] fix flows data flow 2016-06-24 00:03:32 +08:00
Jason
bd4cf8fef2 [web] ws methods 2016-06-23 23:56:24 +08:00
Jason
84683e7abb [web] check item existence before update 2016-06-23 23:48:17 +08:00
Jason
f50dc62249 [web] fix eventLog ducks 2016-06-23 23:44:53 +08:00
Jason
5adb7a54fd [web] separate views and list 2016-06-23 23:20:41 +08:00
Jason
749d710665 [web] fix data connection 2016-06-23 01:30:28 +08:00
Jason
3c4e81aeff [web] fix utils/list 2016-06-23 01:23:16 +08:00
Jason
2358d79ac5 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list 2016-06-23 01:15:46 +08:00
Jason
72fdca49ec [web] connect new ducks actions 2016-06-23 01:15:14 +08:00
Jason
bcea39657a [web] fix ducks/flows 2016-06-23 01:06:45 +08:00
Jason
7671224b4c [web] remove ducks/utils/view 2016-06-23 01:02:29 +08:00
Jason
2a9a6f6151 [web] flows.makeFun 2016-06-23 01:01:39 +08:00
Jason
60ea300990 [web] FlowActions -> flows ducks 2016-06-23 00:58:45 +08:00
Jason
c0904e9aed [web] refactoring ducks/flows 2016-06-23 00:49:26 +08:00
Jason
a42512a1cc [web] finish utils/list 2016-06-23 00:17:35 +08:00
Jason
57af1d00dd [web] set connected to false when DISCONNECTED 2016-06-22 11:29:21 +08:00
Jason
26aed8f56f [web] updateSettings -> handleWsMsg 2016-06-22 11:24:22 +08:00
Jason
42f433e395 [web] use a dummy action to init list 2016-06-22 11:16:08 +08:00
Jason
1fc11974a7 [web] update eventlog 2016-06-22 11:12:58 +08:00
Jason
9a7415a58d [web] store ws object in symbol property 2016-06-22 00:51:45 +08:00
Jason
0cab9ef1fa Merge remote-tracking branch 'origin/master' into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-22 00:49:21 +08:00
Maximilian Hils
65955ee45f add better description 2016-06-20 21:01:24 -07:00
Clemens
37475217bf added tests for ui 2016-06-20 21:00:27 -07:00
Clemens
79834676cb added accept and revert to flowmenu 2016-06-20 10:20:41 +02:00
Jason
d01e49c6d5 [web] replace SetttingsActions.update with settings.updateSettings 2016-06-19 02:53:15 +08:00
Jason
9cb5b0af9d Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js
 2016-06-18 14:18:24 +08:00
Jason
6c0511b06f [web] add app ducks 2016-06-18 14:11:47 +08:00
Maximilian Hils
f203936fbf add setInterceptPattern action creator 2016-06-17 21:06:17 -07:00
Maximilian Hils
6a41ea9171 add fetchApi.put shortcut 2016-06-17 21:05:30 -07:00
Maximilian Hils
ce53799c62 simplify settings reducer 2016-06-17 21:03:19 -07:00
Jason
965b27b529 [web] simplify settings 2016-06-17 22:12:32 +08:00
Jason
c82d27b2a2 Merge branch 'master' into settings 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:58:24 +08:00
Jason
e4addd60f1 Merge branch 'master' into websocket 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:54:31 +08:00
Jason
034287edcf [web] clean up 2016-06-17 07:57:06 +08:00
Jason
16a28eca25 [web] websocket 2016-06-17 07:26:29 +08:00
Jason
7a78970d10 [web] common 2016-06-17 07:07:38 +08:00
Jason
4ce7a9ba77 [web] editor config for line endings 2016-06-17 06:26:46 +08:00
Jason
6ad2f13341 [web] fix settings ducks 2016-06-17 06:01:29 +08:00
Jason
cedac98b70 [web] promot reduce 2016-06-17 05:08:05 +08:00
Jason
7fb0836bfe [web] remove store 2016-06-17 05:08:05 +08:00
Jason
b88937f1e0 [web] eliminate SettingsStore 2016-06-17 05:08:05 +08:00
Jason
99b2b8633d [web] settings store 2016-06-17 05:08:05 +08:00
Jason
f5c597a9e3 [web] Editor & Prompt 2016-06-17 04:38:35 +08:00
Jason
e5bf1e930a [web] FlowView and ContentView 2016-06-17 04:37:57 +08:00
Maximilian Hils
1fc2db85fa web: fix tests 2016-06-16 03:06:08 -07:00
Maximilian Hils
848e7c6c50 web: use implicit bindActionCreators 2016-06-15 14:32:03 -07:00
Maximilian Hils
94e2929b3f minor fixes 2016-06-15 13:39:56 -07:00
Clemens
48e372bf98 rename view -> ui, make code more readable 2016-06-15 08:54:55 +02:00
Clemens
00b4abfe83 add previous state to dispatch function 2016-06-15 00:19:33 +02:00
Clemens
003096b4cc code review 2016-06-14 22:17:34 +02:00
Clemens
bf75e14573 added flowMenu 2016-06-14 11:20:48 +02:00
Jason
81a0c45c89 [web] header.js -> Header.js 2016-06-09 20:35:03 +08:00
Jason
6c95635cb8 [web] eventlog.js -> EventLog.jsx 2016-06-09 18:40:59 +08:00
Jason
1baefcdc99 [web] footer.js -> Footer.jsx 2016-06-09 18:13:18 +08:00
Jason
e24bf8d73f [web] fix shortcut for header fields 2016-06-09 18:03:40 +08:00
Jason
f306cfa8b6 [web] separate flowtable to multiple files 2016-06-09 17:52:30 +08:00
Jason
8e538c7630 [web] fix updateLocation 2016-06-09 14:20:14 +08:00
Jason
851bb4bf68 [web] rewrite ProxyApp and MainView with es6 2016-06-09 13:35:41 +08:00
Maximilian Hils
7707d096d2 fix default websocket state 2016-06-08 19:41:34 -07:00
Clemens
ad84d650de sorting add pr review changes 2016-06-08 10:29:33 +02:00
Clemens
dbbda03020 sorting done, ready to review 2016-06-07 11:22:52 +02:00
Clemens
fa3ad2382b sorting done, ready to review 2016-06-07 11:07:25 +02:00
Clemens
1aac283e23 moved redux state injection closer to child 2016-06-07 11:07:25 +02:00
Clemens
ff2129773f start with sort, continue tomorrow 2016-06-07 11:07:25 +02:00
Clemens
ac2d8549e5 moved sort state to redux, missing apply sort 2016-06-07 11:07:25 +02:00
Maximilian Hils
54ee8ff4d4 web: accept all falsey sortFns in sortedIndexOf 2016-06-06 15:47:31 -07:00
Maximilian Hils
d878122cf9 web: fix list update propagation 2016-06-05 18:43:17 -07:00
Maximilian Hils
e6ef149a03 web: modernize flow table columns 2016-06-05 18:23:06 -07:00
Maximilian Hils
445a89e842 web: fix list reducer 2016-06-05 18:20:15 -07:00
Maximilian Hils
d53a2de0ba web: completely move flow state to redux 2016-06-04 18:53:41 -07:00
Maximilian Hils
e880f532ad web interleave old store and redux flow state 2016-06-04 00:58:13 -07:00
Maximilian Hils
b02d66491c web: implement update and remove for list and view 2016-06-04 00:37:10 -07:00
Maximilian Hils
1b1ea98f08 web: add flows to redux state 2016-06-03 18:53:30 -07:00
Maximilian Hils
1b327f34c3 web: add redux list views 2016-06-03 18:38:25 -07:00
Maximilian Hils
ff9cc8b283 web: remove old event log store 2016-06-03 18:38:25 -07:00
Maximilian Hils
d6fcd7e06d web: implement redux store fetching 2016-06-03 18:38:25 -07:00
Maximilian Hils
e31aa39fc2 Merge branch 'redux-ducks' 2016-06-02 23:45:36 -07:00
Maximilian Hils
5321f15def web: fix eventlog height registration 2016-06-02 23:41:32 -07:00
Maximilian Hils
7afac747a8 web: reduxify event log store 2016-06-02 23:40:30 -07:00
Maximilian Hils
7c63aa3708 web: reduxify WebSocket 2016-06-02 21:12:59 -07:00
Maximilian Hils
6a91ab166f remove reducers directory 2016-06-02 19:29:03 -07:00
Maximilian Hils
698d38b28e web: 🐣 2016-06-02 17:46:18 -07:00
Maximilian Hils
9c6da08d00 fix dumpfile upload 2016-06-02 11:41:26 -07:00
Maximilian Hils
73e494770f web: add fetchApi convenience method 2016-06-02 10:34:16 -07:00
Clemens
89fc438e32 change some pr issuses 2016-06-02 10:31:24 -07:00
Clemens
a219d33430 basic file up and download working 2016-06-02 10:30:53 -07:00
Clemens
cf544318ae basic file up and download working 2016-06-02 10:30:43 -07:00
Clemens
dfc033ab5f added basic file up_download functionality (not finish yet) 2016-06-02 10:30:43 -07:00
Clemens
3e6a74f4ee added ui 2016-06-02 10:29:55 -07:00
Maximilian Hils
7a388560d7 use object spread operator 
While the spread operator is not part of ES6, React also uses it for JSX.
It makes sense for us to keep it in other parts of the codebase as well.
 2016-06-02 09:51:39 -07:00
Maximilian Hils
9e3591e3c2 add basic redux architecture, convert eventlog to redux 2016-06-02 00:04:10 -07:00
Clemens Brunner
6652e3a369 start of developing server side for options (#1155) 
* added UI for options menu

* update UI for options menu

* update UI for options v2

* update UI for options v2

* added new btn class

* little changes

* little changes

* merge

* deleted branch

* change menu button class

* added option route + added very incomplete handler class

* moved options to settings

* added toggleinputbutton

* changed options menu

* added option for stream large bodies, but no working

* added option for stream large bodies, but no working
 2016-05-29 23:34:30 -07:00
Jason
fb639c2e11 [web] add default value for text views 2016-05-28 01:10:09 +08:00
Jason
6529a3aa3e [web] eliminate RawMixin 2016-05-28 00:43:33 +08:00
Jason
6bf74955b9 [web] use props.location instead of context.location 2016-05-24 23:16:30 +08:00
Jason
61453aa847 [web] eliminate Router mixin 2016-05-24 23:08:21 +08:00
Clemens Brunner
902cd255d4 added UI for options menu (#1130) 
* added UI for options menu

* update UI for options menu

* update UI for options v2

* update UI for options v2

* added new btn class

* little changes

* little changes

* merge

* deleted branch

* change menu button class
 2016-05-14 05:40:11 -06:00
Maximilian Hils
d84fc645a7 docs: minor fixes 2016-04-30 15:25:02 -07:00
Jason
ae61025d5d [web] fix virtual scroll range 2016-03-12 23:06:21 +08:00
Jason
1c0496e051 [web] VirtualScroll and AutoScroll helper 2016-03-10 21:40:07 +08:00
Maximilian Hils
b413a052f9 Merge pull request #1012 from gzzhanghao/router 
[web] eliminate common.Router.getParams
 2016-03-09 18:54:34 +01:00
Maximilian Hils
454cca43f0 Merge pull request #1015 from gzzhanghao/props 
[web] dont mutate props
 2016-03-09 18:53:05 +01:00
Jason
84f180847d [web] dont mutate props 2016-03-09 13:30:55 +08:00
Jason
4522b2b62f [web] fix footer label margin 2016-03-09 00:39:51 +08:00
Jason
df8b21c08f [web] eliminate common.Router.getParams 2016-03-09 00:28:44 +08:00
Jason
ca9a493a1c [web] uniform code style for Footer component 2016-03-08 00:57:01 +08:00
Jason
0545326dc0 [web] eliminate SettingsState 2016-03-07 18:47:08 +08:00
Maximilian Hils
34d19cf12e Merge pull request #994 from gzzhanghao/common 
[web] remove common.ChildFocus
 2016-03-05 13:20:43 +01:00
Jason
70cde8ccaa [web] Fix eslint warnings about tests 2016-03-02 23:04:13 +08:00
Jason
1d002182e3 [web] remove common.ChildFocus 2016-03-02 22:37:32 +08:00
Jason
70af4fae46 [web] StoreView.index -> indexOf 2016-03-02 21:55:36 +08:00
Jason
eb19077913 [web] fix StoreView.index 2016-03-02 15:59:56 +08:00
Maximilian Hils
3de89ab16c web: use es6 modules 2016-02-29 02:57:35 +01:00
Maximilian Hils
9192427d7b web: fix router 2016-02-29 02:16:38 +01:00
Maximilian Hils
cbb068edaa fix up web stuff 2016-02-28 22:35:08 +01:00
Maximilian Hils
18b619e164 move mitmproxy/web to root 2016-02-18 12:29:35 +01:00
Maximilian Hils
33fa49277a move mitmproxy 2016-02-15 14:58:46 +01:00
Maximilian Hils
7d8191ee37 update web builds, use watchify 2015-10-08 12:43:55 +02:00
Maximilian Hils
906360f63f code -> status_code, httpversion -> http_version 2015-09-17 15:16:33 +02:00
Maximilian Hils
0af0608978 adjust to netlib changes 2015-09-16 18:45:22 +02:00
Maximilian Hils
d389b9c59d fix #615 2015-06-08 19:01:32 +02:00
Maximilian Hils
62ff239e41 check in last attempt at contenteditable before retreating to inputs 2015-05-02 16:23:57 +02:00
Maximilian Hils
bb965b8e34 web: try harder to fix editor 2015-05-01 20:45:31 +02:00
Maximilian Hils
3f5ca10c39 mitmweb: add editor 2015-05-01 17:24:44 +02:00
Legend Tang
269571efe5 web: fix delete flows 2015-03-30 20:18:56 +08:00
Maximilian Hils
6d29f93e9e web: add prompt for keyboard navigation 2015-03-30 03:49:50 +02:00
Maximilian Hils
737002921e s/filter/search/ 
no matter what we agree on in #542,
this needs to be done anyway.
 2015-03-30 00:46:33 +02:00
Maximilian Hils
93d1d0416d web: add more keyboard shortcuts 2015-03-29 03:24:03 +02:00
Maximilian Hils
fd911b75e6 web: global key handling 2015-03-29 01:45:37 +01:00
Maximilian Hils
1913975fa6 web: use contexts to pass down stores. 
Using contexts frees us from the contracts we have
using props - namely, we can assume them to be constant
for the lifetime of the object.
 2015-03-27 21:58:04 +01:00
Maximilian Hils
f39e6c5c18 web: minor ux improvements 2015-03-27 18:51:25 +01:00
Maximilian Hils
dcb42b3016 web: fix react-router 2015-03-27 16:54:21 +01:00
Maximilian Hils
11b082c998 Merge remote-tracking branch 'vzvu/react-router-0.13.2' 
Conflicts:
	libmproxy/web/static/vendor.js
 2015-03-27 16:17:35 +01:00
Maximilian Hils
42cd942b64 web: initial attempt at header editor 2015-03-27 15:30:19 +01:00
vzvu3k6k
d65a4b6100 web: upgrade to react-router 0.13.2 2015-03-27 04:32:38 +09:00
Maximilian Hils
968c7021df web: add basic edit capability for first line 2015-03-23 00:24:56 +01:00
Maximilian Hils
2acd77dea0 web: add content download 2015-03-22 15:29:55 +01:00
Maximilian Hils
39a8ac7e2a web: improve views 2015-03-22 15:19:35 +01:00
Maximilian Hils
cf9f91b0b4 web: upgrade to react 0.13 2015-03-22 14:33:42 +01:00
Maximilian Hils
9415846232 web: raw content view 2015-03-22 02:25:47 +01:00
Maximilian Hils
89d66360d6 tweak css 2015-03-22 00:28:08 +01:00
Maximilian Hils
1143552e16 web: add content views 2015-03-22 00:21:38 +01:00
Maximilian Hils
02a61ea45d structure components 2015-03-21 22:49:51 +01:00
Maximilian Hils
ac5d74d42c web: fix bugs 2015-03-21 21:55:02 +01:00
Maximilian Hils
40c242c3f6 add table sort 2015-03-17 03:05:59 +01:00
Maximilian Hils
4a92c42517 web: smaller changes 2015-03-15 22:05:50 +01:00
Maximilian Hils
353a6ace47 Merge remote-tracking branch 'legend/master' 
Conflicts:
	libmproxy/web/static/app.js
 2015-03-06 10:05:12 +01:00
Legend Tang
de306e6aeb fix #506 2015-03-06 16:54:18 +08:00