Josh Barnes
e49fb8bcec
Ensure NbserverListApp produces valid json even for multiple/no servers
2017-07-28 11:51:59 +01:00
Kyle Kelley
3c62f3bc5d
Merge pull request #2702 from gnestor/image-gif
...
Add image/gif mimetype
2017-07-27 19:57:22 -07:00
samarsultan
57da7fa019
Resolving Conflicts
2017-07-28 03:09:56 +02:00
Grant Nestor
d00617a064
Add image/gif mimetype
2017-07-27 15:02:48 -07:00
Grant Nestor
dbda33090f
Merge pull request #2677 from mpacer/mjax_labels
...
clear equation labels on typesetting so that labels don't stop equations from rendering
2017-07-27 10:40:00 -07:00
Grant Nestor
bbd2ac6112
Merge pull request #2691 from invisibleroads/patch-1
...
Restore flat edge of rendered html code block
2017-07-27 09:59:02 -07:00
Thomas Kluyver
63aa0df454
Merge pull request #2696 from gnestor/cm-keymaps
...
Add missing codemirror keymaps to keyboard shortcuts dialog
2017-07-27 17:31:35 +01:00
Roy Hyunjin Han
644a8aad8d
Add padding to inline code as requested by @gnestor
2017-07-27 12:22:34 -04:00
Grant Nestor
cf6d305d93
Merge pull request #2698 from takluyver/fuzz-check-last-modified
...
Allow 0.5 seconds difference in file timestamps before warning of conflicting change
2017-07-27 09:12:21 -07:00
Grant Nestor
97d1730bdc
Merge pull request #2699 from takluyver/i1976
...
Validate CodeMirror keyMap from frontend config
2017-07-27 09:10:10 -07:00
Grant Nestor
65598bf1f4
More consistency!
2017-07-27 09:02:47 -07:00
Thomas Kluyver
6d0ea0eef1
Merge pull request #2701 from gnestor/list-newline-style
...
Prevent extra newline between nested lists
2017-07-27 16:44:58 +01:00
Grant Nestor
502c074b2c
Prevent extra newline between nested lists
2017-07-27 08:14:18 -07:00
Grant Nestor
51fc7692aa
Clean up formatting
2017-07-27 08:08:24 -07:00
Grant Nestor
0552b3b1ab
Remove keymap for "esc"
2017-07-27 08:08:04 -07:00
Grant Nestor
1ae816517e
Consistent order for platform-specific keymaps
2017-07-27 08:07:45 -07:00
Kyle Kelley
f50ffae790
Merge pull request #2695 from gnestor/public-server-docs
...
Remove quotes around URL in tornado_settings example
2017-07-27 07:26:12 -07:00
Thomas Kluyver
bd84c5806e
Validate CodeMirror keyMap from frontend config
...
Closes gh-1976
2017-07-27 14:16:53 +01:00
Thomas Kluyver
fd34dd2052
Allow 0.5 seconds difference in file timestamps before warning of conflicting changes
...
See gh-484
2017-07-27 13:24:52 +01:00
Thomas Kluyver
8af8b0eb9b
Merge pull request #2692 from gnestor/terminal-header-flex
...
Fix terminal header flex box layout
2017-07-27 09:56:15 +01:00
Grant Nestor
b56e3b16df
Add missing codemirror keymaps to keyboard shortcuts dialog
2017-07-26 14:56:32 -07:00
Grant Nestor
f42ef1a5f5
Remove quotes around URL in tornado_settings example
2017-07-26 14:27:23 -07:00
Grant Nestor
5ae0113d9b
Merge pull request #2687 from takluyver/i2673
...
Only show busy favicon when execution lasts > 1s
2017-07-26 14:11:05 -07:00
Grant Nestor
135358e943
Fix terminal header flex box layout
2017-07-26 13:54:21 -07:00
Roy Hyunjin Han
9701f6b1cd
Revert 533aea11fd
...
The extra padding causes the first line of each markdown rendered code block to be indented, but does not indent the rest of the code block, resulting in a jagged left edge. Removing this bit of CSS restores a flat left edge.
You can verify this by trying to render the following:
abc
def
ghi
2017-07-26 15:41:32 -04:00
Grant Nestor
a9160356df
Merge pull request #2688 from jasongrout/jitter
...
Fix jitter caused by rounding height.
2017-07-26 08:53:23 -07:00
Kyle Kelley
937d06f0ca
Merge pull request #2689 from takluyver/application-mime-not-editable
...
Don't assume that application/ mime types are editable
2017-07-26 07:53:19 -07:00
Thomas Kluyver
5c66955fab
Smarter check for editable mimetypes
2017-07-26 14:38:44 +01:00
Thomas Kluyver
75f1b9ae26
Don't assume that application/ mime types are editable
...
The application media type includes many common binary files like
application/zip and application/pdf.
2017-07-26 13:55:19 +01:00
Jason Grout
b04db891f2
Fix jitter caused by rounding height.
2017-07-26 08:04:48 -04:00
Thomas Kluyver
5faa2ab9b5
Protect against no element with id=favicon
2017-07-26 12:59:25 +01:00
Thomas Kluyver
0bd5fe8759
Only show busy favicon when execution lasts > 1s
...
This avoids making lots of HTTP requests as we rapidly change the favicon
between the 'notebook' (idle) and 'busy' icons. Now it should be no more
than one per second in the most pathological case.
Closes gh-2673
2017-07-26 12:52:40 +01:00
Matthias Bussonnier
38b789a7d8
Merge pull request #2684 from gnestor/master
...
Reset the target cell's undo history after merge_cells
2017-07-25 13:41:14 -07:00
Grant Nestor
4532b14808
Reset the target cell's undo history after merge_cells
2017-07-25 12:12:17 -07:00
Grant Nestor
572cc37273
Fix hidden prompt overlay button
2017-07-24 16:37:53 -07:00
Grant Nestor
67b0723929
Merge pull request #2675 from takluyver/no-animated-favicon
...
Don't use animated favicon when kernel busy
2017-07-24 14:51:11 -07:00
M Pacer
e2405cebe9
clear equation labels on typesetting so that labels don't block renders
2017-07-20 15:29:43 -07:00
Kyle Kelley
c64104257a
Merge pull request #2674 from minrk/csp-fixes
...
ensure "default-src 'none'" CSP is added to APIHandlers
2017-07-20 07:18:35 -07:00
Thomas Kluyver
5c6a1c8f78
Don't use animated favicon when kernel busy
...
Addresses part of gh-2673
Each set of the favicon causes a new HTTP request.
If we want an animated favicon, I think it's possible to use an animated
GIF. But I find animated favicons annoying, so I'd rather just get rid
of it entirely. Just because we can doesn't mean we should. ;-)
2017-07-20 14:56:06 +01:00
Min RK
c4a5dc04bf
Merge pull request #2666 from takluyver/i2094
...
Expose URL with auth token in notebook UI
2017-07-20 15:42:48 +02:00
Min RK
2a08debd18
Merge pull request #2672 from takluyver/logout-not-logged-in
...
Render the logout page without auth tokens
2017-07-20 15:42:21 +02:00
Min RK
0308dc78d9
ensure "default-src 'none'" CSP is added to APIHandlers
...
even if custom Content-Security-Policy header is applied,
which was previously setting the same value for both APIHandlers and page handlers
2017-07-20 15:35:00 +02:00
Thomas Kluyver
22e2a7720f
Render the logout page without auth tokens
...
The user is technically still logged in when the logout page is
produced, but this is not obvious to the user, and they may leave the
page open.
This ensures that it is rendered without information such as auth tokens
which should only be available to a logged-in user.
2017-07-20 13:32:39 +01:00
Thomas Kluyver
227704cda5
Merge pull request #2671 from minrk/dont-modify-headers
...
avoid modifying settings['headers'] in add_default_headers
2017-07-20 11:03:32 +01:00
Thomas Kluyver
66049ea15e
Merge pull request #2670 from minrk/xsrf-csp-report-again
...
typo in skip_check_origin
2017-07-20 10:58:24 +01:00
Thomas Kluyver
208e7c74a6
Only provide token link if token is set and user logged in
2017-07-20 10:40:42 +01:00
Min RK
f512880fcb
allow overriding csp report uri via tornado settings
2017-07-20 10:51:38 +02:00
Min RK
fb7ee6f348
avoid modifying settings['headers'] in add_default_headers
...
Use a copy to avoid writing content security policy into settings['headers'],
which can be a problem because APIHandlers have a stricter CSP than page handlers.
If an API request is made before the first page request, pages will fail to load due to CSP violations.
2017-07-20 10:43:42 +02:00
Min RK
4e37ebfb47
typo in skip_check_origin
...
method was ignored because it had the wrong name
2017-07-20 10:00:33 +02:00
Thomas Kluyver
ea2bfeda8f
Expose URL with auth token in notebook UI
...
This provides a crude way to copy the link from one browser (right click
the Jupyter logo) to get authenticated in another browser.
Closes gh-2094
2017-07-19 16:41:45 +01:00