Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-01 19:48:34 +00:00
Code Issues Projects Releases Wiki Activity
6,427 Commits 1 Branch 67 Tags 50 MiB
82ecc5448d
Commit Graph

377 Commits

Author SHA1 Message Date
Clemens
d0b420f383 fix refactoring bug 2016-08-19 09:58:29 +02:00
Clemens
d4b18eae81 refactoring 2016-08-19 09:23:41 +02:00
Clemens
66e9db3713 refactor contentviews, dropdown, filemenu and footer 2016-08-18 18:05:38 +02:00
Clemens
a416732665 refactor dropdown menu, view selector 2016-08-18 16:44:49 +02:00
Clemens
0f4eb24a8d fix viewselector bug 2016-08-17 12:19:04 +02:00
Clemens
cc838f6c28 refactor codeeditor 2016-08-17 12:12:32 +02:00
Clemens
2236ed4ba5 fix deselection on delete, fix toggleInputButton props 2016-08-17 11:07:56 +02:00
Clemens
dbec2e0940 refactor flow menu 2016-08-16 13:17:37 +02:00
Clemens
779e5e84e3 refactor file up and download 2016-08-16 12:37:35 +02:00
Clemens
57fafd3281 refactor header_options 2016-08-16 11:57:12 +02:00
Maximilian Hils
f9f0ac848e Merge pull request #1483 from gzzhanghao/history 
[web] Use history object instead of react-router
 2016-08-15 23:13:57 -07:00
Jason
81b726bab1 [web] bug fix 2016-08-16 00:27:57 +08:00
Jason
1d27334ff7 [web] remove react-router 2016-08-15 23:09:45 +08:00
Clemens
8b43972b95 move content to redux, add lines to view 2016-08-10 10:49:27 +02:00
Clemens
6397c4d02f fix css bug 2016-08-09 20:45:36 +02:00
Clemens
b27e456ce2 merge with master 2016-08-09 19:49:36 +02:00
Clemens
78bd99f97c little changes in css 2016-08-09 16:15:45 +02:00
Clemens
adfdcc9391 added hints from mhils 2016-08-09 08:40:24 +02:00
Clemens
ab322f0be4 add sticky footer contentview 2016-08-06 09:09:45 +02:00
Clemens
9b0b007a5d change some style 2016-08-05 12:47:34 +02:00
Clemens
a8aa1f2d1c fix get contentview in mitmweb 2016-08-04 09:34:36 +02:00
Clemens
fd7b6b958e litte style changes 2016-08-03 15:40:23 +02:00
Clemens
34fe391afb add view all button, add dropdown for contentviews 2016-08-03 12:08:10 +02:00
Clemens
a56c2ca731 combine clientside and serverside contentviews 2016-07-29 09:45:15 +02:00
Clemens
2807329fb2 add image to mitmproxy.contentview.image 2016-07-28 17:28:05 +02:00
Clemens
ad5bebeda0 mitmproxy.contentviews added 2016-07-28 17:10:06 +02:00
Maximilian Hils
3aad011988 Merge pull request #1406 from gzzhanghao/fix36 
[web] Update view with sortedUpdate
 2016-07-27 14:55:08 -07:00
Clemens Brunner
41383b866e add favicon to mitmweb (#1440) 2016-07-27 11:20:36 -07:00
Clemens
3e6c284757 add contentviews to client 2016-07-27 17:27:01 +02:00
Clemens
2c3ddb0ecc add parameter to content requests 2016-07-27 10:21:06 +02:00
Jason
2b9e5dcd1b [web] change test files 2016-07-27 00:39:01 +08:00
Maximilian Hils
3ebb58f641 add up/download button to ContentTooLarge view 2016-07-25 17:50:59 -07:00
Maximilian Hils
03a596d1d9 simplify stop edit 2016-07-25 17:45:42 -07:00
Maximilian Hils
67bfc1df14 fix flow edit 2016-07-25 17:31:37 -07:00
Maximilian Hils
aee693a5c0 Merge remote-tracking branch 'jason/style' into flow_editing_v2 2016-07-25 17:13:00 -07:00
Maximilian Hils
e1587b2bc1 make empty buttons editable 2016-07-25 17:12:39 -07:00
Maximilian Hils
70dbd1b32d web: refactor ContentLoader 2016-07-25 17:03:50 -07:00
Maximilian Hils
79ebcb046e Merge remote-tracking branch 'origin/master' into flow_editing_v2 2016-07-25 15:16:16 -07:00
Jason
7b51f12813 [web] bug fix and add test 2016-07-26 02:09:54 +08:00
Clemens
68e437a740 rewrite getDiff 2016-07-25 17:33:36 +02:00
Clemens
1ea094e9dc remove auto change to raw mode on edit 2016-07-25 15:47:05 +02:00
Clemens
ca4541613c combine content with header updates 2016-07-25 14:34:00 +02:00
Clemens
61ef7ca91b added contentHash 2016-07-25 10:56:12 +02:00
Clemens
0aedea6e60 remove lastFileUpload field 2016-07-25 09:05:24 +02:00
Jason
0a4bb394da [web] style improvement 2016-07-24 18:34:06 +08:00
Jason
3a3305b9ac [web] fix: Flow update changes list order #36 2016-07-24 18:25:09 +08:00
Clemens
f578bf5122 file upload updates contentview, editable contentloader, diffs on upload 2016-07-22 19:07:53 +02:00
Clemens
70ca10b423 moved editor to raw_view mode, add content_file_upload 2016-07-21 19:13:16 +02:00
Maximilian Hils
3d6f714b5d web: perf++ 2016-07-21 03:00:10 -07:00
Clemens
61f192434f moved editor to raw_view mode 2016-07-21 11:50:02 +02:00
Maximilian Hils
8a3a21bba1 web: fix ValueEditor, clean up code 2016-07-21 01:14:55 -07:00
Clemens
281f20ef1e added flow_content update 2016-07-19 16:13:26 +02:00
Clemens
698fb11132 Merge remote-tracking branch 'origin/master' into flow_editing 2016-07-19 12:32:36 +02:00
Maximilian Hils
18dd84b908 web: fix flow selection 2016-07-19 03:23:40 -07:00
Clemens
48728af43a moved flow editor state to redux 2016-07-19 12:23:20 +02:00
Maximilian Hils
f356a84430 simplify web ui ducks 2016-07-19 03:13:39 -07:00
Maximilian Hils
5034a6232c web: remove SELECT_RELATIVE 2016-07-18 21:23:50 -07:00
Maximilian Hils
859bb8c99f Merge remote-tracking branch 'jason/ui' 2016-07-18 20:59:17 -07:00
Clemens
87797d7ac0 added new btn, changed to codemirror 2016-07-15 14:41:30 +02:00
Clemens
5f3782dd5f change way to edit 2016-07-14 23:01:34 +02:00
Clemens
45349b3597 chaged editor style 2016-07-13 20:53:05 +02:00
Clemens
baac6c4693 gzip issue 2016-07-13 20:44:35 +02:00
Clemens
121079934e make file out ouf string to combine flow content updates via editor and fileupload 2016-07-13 20:18:04 +02:00
Clemens
f84098554a added code editor and file upload 2016-07-13 18:16:31 +02:00
Clemens Brunner
2624911d75 fixed bug (#1342) 
fix minor mitmweb issues
 2016-07-12 14:52:33 -07:00
Clemens
544b1e3238 modify flow content 2016-07-11 19:49:58 +02:00
Jason
666017125a [web] add tests for main view and ui 2016-07-08 21:59:34 +08:00
Jason
09ab2528f5 [web] bug fixs 2016-07-05 13:57:32 -04:00
Jason
7b543dd95c [web] bug fix 2016-07-05 13:43:37 -04:00
Jason
db991e2bcc [web] set display large 2016-07-05 22:49:41 +08:00
Jason
af2319aa64 [web] listen to window.onKeyDown 2016-07-05 22:28:00 +08:00
Jason
9bfde2a3ae [web] change ducks/ui 2016-07-05 11:12:07 +08:00
Jason
8f73dc79c0 [web] ui ducks for content view 2016-07-01 23:44:48 +08:00
Jason
37c2b47c26 [web] add tests for utils 2016-06-27 18:42:20 +08:00
Maximilian Hils
ed9a72553d fix mitmproxy/mitmweb#25 2016-06-26 02:17:07 -07:00
Maximilian Hils
370e6caedc [web] (mostly) remove jQuery 2016-06-26 02:05:41 -07:00
Maximilian Hils
3eb2d04aac minor fixes 2016-06-26 01:45:45 -07:00
Maximilian Hils
1c240d919a [web] sorter -> sort 2016-06-25 19:58:11 -07:00
Jason
db415a26bc [web] log only in dev 2016-06-25 10:50:15 +08:00
Jason
aecc267eb9 [web] fix imports 2016-06-25 10:06:38 +08:00
Jason
64fda2c735 [web] fix update filter 2016-06-25 10:03:51 +08:00
Jason
e400e9f513 [web] ErrorView 2016-06-25 09:52:49 +08:00
Jason
2b7923b4f4 [web] fix actions 2016-06-25 02:18:52 +08:00
Jason
8da623c603 [web] fix selectFlows 2016-06-25 00:53:56 +08:00
Jason
571c817f21 [web] add msgQueue 2016-06-25 00:36:39 +08:00
Jason
5a1677c387 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/app.jsx
	web/src/js/connection.js
	web/src/js/ducks/websocket.js
 2016-06-24 21:04:39 +08:00
Maximilian Hils
21c3480429 Merge remote-tracking branch 'jason/websocket' 2016-06-23 23:38:19 -07:00
Jason
f392b8e34c [web] bug fix 2016-06-24 01:20:42 +08:00
Jason
c40ff0277b [web] fix bugs 2016-06-24 01:01:34 +08:00
Jason
e11d6600be [web] fix eventLog flow 2016-06-24 00:16:59 +08:00
Jason
1df67dbe9d [web] reduce eventlog view 2016-06-24 00:15:37 +08:00
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