Commit Graph

6998 Commits

Author SHA1 Message Date
Maximilian Hils
c1ba6b6c21 [web] fix stopEdit 2017-06-12 12:57:37 +02:00
Thomas Kriechbaumer
2ceefe9582 Merge pull request #2390 from ograff/remove_private_key_pkcs12
Remove private key from PKCS12 file
2017-06-12 11:15:37 +02:00
Maximilian Hils
c89d076cf3 Merge pull request #2376 from MatthewShao/jest-dev
[WIP][web] Add tests for components/ContentView (con't)
2017-06-12 10:59:27 +02:00
Oliver Graff
bd9d0bf6b1 Remove private key from PKCS12 file
Fixes #2349
2017-06-12 01:44:26 -07:00
Matthew Shao
49a04e37c3 [web] Update ContentLoader class name. 2017-06-12 08:41:40 +08:00
Thomas Kriechbaumer
93d37e29c3 Merge pull request #2389 from ujjwal96/test-coverage
Tests for Proxy config
2017-06-11 22:48:45 +02:00
Ujjwal Verma
4587b54aed tests for Proxy config 2017-06-12 01:32:58 +05:30
Aldo Cortesi
c03f14cba6 Merge pull request #2388 from cortesi/consolebits
A few console-related bits and bobs
2017-06-11 22:35:05 +12:00
Aldo Cortesi
a61178f28a console: console.eventlog.clear command, bind to "z" by default 2017-06-11 22:16:02 +12:00
Aldo Cortesi
9c57508fde console: extract "enter" to m_select
Regularise, kill dead code, remove keybindings now not needed.
2017-06-11 21:55:31 +12:00
Aldo Cortesi
60de6e6d1e console: delete stale help code 2017-06-11 21:22:55 +12:00
Aldo Cortesi
a482868cd6 console: extract "tab" to m_next pseudo-key
This makes tab work consistently across contexts, makes it globally bindable,
and gets rid of an un-needed command.
2017-06-11 21:20:12 +12:00
Aldo Cortesi
0e569d1af1 Merge pull request #2387 from cortesi/helptext
console: Key binding help
2017-06-11 19:03:29 +12:00
Aldo Cortesi
926b58ab4f console: Make global nav keys work within help 2017-06-11 18:57:02 +12:00
Aldo Cortesi
fdfd3ed937 console: Key binding help
Add a help field to key bindings, use that in contextual help display.
2017-06-11 18:19:23 +12:00
Aldo Cortesi
40703afd0a Merge pull request #2386 from cortesi/help
console help
2017-06-11 17:45:59 +12:00
Aldo Cortesi
7caa7e7538 console: auto-generate context key binding help 2017-06-11 17:09:52 +12:00
Aldo Cortesi
fd68eca351 Keep emojis out of tox.ini
This breaks config parsers like the one used by flake8. Also... emojis? In a
config file?
2017-06-11 16:18:40 +12:00
Aldo Cortesi
816a51b6c8 console: help - remove hardcoded help everywhere 2017-06-11 13:28:31 +12:00
Aldo Cortesi
75c047da3f Merge pull request #2384 from cortesi/layouts
console: layout pane headers
2017-06-11 13:14:30 +12:00
Aldo Cortesi
ecce260542 console: generalise grideditor help text, only show headers if we have them 2017-06-11 12:07:02 +12:00
Aldo Cortesi
a4833a5bbf console: grideditor - re-add column headers
Also remove special-case shortcut for user-agent. This is awkward in the new
structure. Down the track we can come up with a more regular mechanism like
snippets.
2017-06-11 11:57:44 +12:00
Aldo Cortesi
d7cc7e62a2 console: grideditor keybindings for r, R and e 2017-06-11 11:47:04 +12:00
Aldo Cortesi
f804495fd8 console: overlays shouldn't clear window titles 2017-06-11 11:17:19 +12:00
Aldo Cortesi
8427c2c4c7 console: extract grideditor keybindings
Also formalise the LayoutWidget interface a bit
2017-06-11 11:05:03 +12:00
Aldo Cortesi
2054739c1e console: grideditors don't display their own titles anymore 2017-06-10 10:09:48 +12:00
Aldo Cortesi
040238e255 console: layout pane heaaders
Controlled with the new console_layout_headers option
2017-06-10 09:54:03 +12:00
Matthew Shao
d1a40def20 [web] Export PureViewServer in ContentView/ContentView.jsx 2017-06-08 11:26:36 +08:00
Matthew Shao
602ab1a687 [web] Add tests for js/components/ContentView/ContentView.jsx 2017-06-08 11:13:59 +08:00
Matthew Shao
55fd82b8f0 [web] Add tests for js/components/ContentView/ContentLoader.jsx 2017-06-08 11:09:29 +08:00
Matthew Shao
edd363262c [web] Add mock-xmlhttprequest dependency. 2017-06-08 11:06:24 +08:00
Matthew Shao
4d3d18784e [web] Add tests for js/components/ContentView/ViewSelector.jsx 2017-06-06 19:07:35 +08:00
Matthew Shao
3d51595b27 [web] Add tests for js/components/ContentView/UploadContentButton.jsx 2017-06-06 19:04:40 +08:00
Maximilian Hils
60f2d37dd8 Merge pull request #2375 from mhils/isatty
Always pretend to have a tty in tests
2017-06-06 12:59:30 +02:00
Matthew Shao
c9a7286b60 [web] Imporve indentation. 2017-06-06 14:59:51 +08:00
Thomas Kriechbaumer
02232b5149 Merge pull request #2379 from ujjwal96/kaitai
Update png.py. Stop reading after IEND
2017-06-06 00:51:03 +02:00
Thomas Kriechbaumer
d2d7502ef0 Merge pull request #2378 from ujjwal96/console-fixes
Fixes #2377 #2323
2017-06-06 00:33:58 +02:00
Ujjwal Verma
8b06dffafb Update png.py. Stop reading after IEND 2017-06-06 03:52:36 +05:30
Ujjwal Verma
dfa693ebd3 Fixes #2377 #2323 2017-06-06 03:16:00 +05:30
Maximilian Hils
387235b580 [requires.io] dependency update on master branch (#2373) 2017-06-05 11:48:28 +02:00
Matthew Shao
bff23275c3 [web] Add tests for js/components/ContentView/ShowFullContentButton.jsx 2017-06-05 10:22:19 +08:00
Matthew Shao
298ac8391e [web] Add tests for js/components/ContentView/MetaViews.jsx 2017-06-05 10:19:09 +08:00
Matthew Shao
46eae0a0b6 [web] Add tests for js/components/ContentView/DownloadContentButton.jsx 2017-06-05 10:17:24 +08:00
Maximilian Hils
9b59937e12 always pretend to have a tty in tests 2017-06-05 00:19:52 +02:00
Maximilian Hils
f3c2123bc7 add windows store experiment 2017-06-04 23:43:23 +02:00
Thomas Kriechbaumer
0c91503b97 check tty after options parsing 2017-06-04 14:34:28 +02:00
Thomas Kriechbaumer
fd63386593 check for tty when running mitmproxy 2017-06-04 13:58:26 +02:00
Thomas Kriechbaumer
020e5a5c95 Merge pull request #2367 from mhils/issue-2329
Fix #2329
2017-06-02 14:18:56 +02:00
Ujjwal Verma
619566fc9f Fixes #2230 (#2361) 2017-06-02 13:31:12 +02:00
Maximilian Hils
a71f76368e Merge pull request #2365 from MatthewShao/jest-dev
[WIP][web] Add tests for components/ContentView
2017-06-02 13:26:38 +02:00