Commit Graph

10467 Commits

Author SHA1 Message Date
Jason Grout
1405693943 Fix the prompt_area argument of the output area constructor. (#2961)
See https://github.com/jupyter/notebook/pull/2681#issuecomment-338322212 and https://github.com/jupyter-widgets/ipywidgets/issues/1765
2017-10-20 17:10:12 -07:00
Thomas Kluyver
c888b6a7b9 Merge pull request #2949 from blink1073/fix-compound-extension
Handle a compound extension in new_untitled
2017-10-20 15:57:58 +02:00
Steven Silvester
7e71c000b0 Rename variable 2017-10-20 07:50:48 -05:00
Steven Silvester
e1533d5398 Clean up logic 2017-10-20 07:48:51 -05:00
Steven Silvester
e95cd6d820 More logic cleanup 2017-10-20 05:55:53 -05:00
Steven Silvester
915146ab3f Clean up logic 2017-10-20 05:51:32 -05:00
Min RK
aa461d9e06 Merge pull request #1968 from takluyver/delete-to-trash
Send files to OS trash mechanism on delete
2017-10-20 11:41:25 +02:00
Thomas Kluyver
8a159500f7 Merge pull request #2916 from minrk/allow-disable-buffering
allow disabling offline message buffering
2017-10-20 10:59:36 +02:00
Thomas Kluyver
55aa80e10f Merge pull request #2920 from minrk/allow-origin-token
allow token-authenticated requests cross-origin by default
2017-10-20 10:55:43 +02:00
Thomas Kluyver
42d966790a Merge pull request #2938 from gnestor/changelog
Update changelog
2017-10-20 10:50:34 +02:00
Thomas Kluyver
95a52f2b86 Merge pull request #2959 from minrk/cookie-path
set cookie on base_url
2017-10-20 10:49:38 +02:00
Min RK
fea2ef258f set cookie on base_url
avoids clobbering cookies when multiple notebook servers are run on one host.

Users can override `cookie_options.path = ‘/‘` if they *want* cookies to be shared across notebooks on one host.
2017-10-19 17:44:11 +02:00
Steven Silvester
f5fa0c180e Handle a compound extension in new_untitled 2017-10-18 12:22:59 -05:00
Ian Rose
f763c03d10 Merge pull request #2943 from mpacer/swagger_api
improve swagger API docs
2017-10-16 19:10:11 -07:00
M Pacer
b0205c4b78 cleanup swagger API docs 2017-10-16 18:07:55 -07:00
Grant Nestor
de1be56e38 Update changelog 2017-10-15 10:26:50 -07:00
Grant Nestor
a8be6598b9 release 5.2.0 2017-10-13 09:29:43 -07:00
Brian E. Granger
65852bb449 Merge pull request #2930 from gnestor/changelog
Add 5.2.0 to changelog
2017-10-12 15:47:26 -07:00
Grant Nestor
61f400236f Add 5.2.0 to changelog 2017-10-12 15:43:13 -07:00
Thomas Kluyver
dd8b695aec Merge pull request #2917 from minrk/fix-auth-file-handler
register contents_manager.files_handler_class directly
2017-10-11 11:28:11 +01:00
Thomas Kluyver
4a3fa4a94c Merge pull request #2921 from minrk/token-env
allow setting token via JUPYTER_TOKEN env
2017-10-11 11:25:45 +01:00
Min RK
08f7189cba only allow CORS exception when auth is enabled 2017-10-11 10:51:12 +02:00
Min RK
9acf6a80f4 allow token-authenticated requests cross-origin by default
we already apply this logic in our server-side checks,
but browsers check `Access-Control-Allow-Origin` headers themselves as well,
meaning that token-authenticated requests can’t be made cross-origin without CORS headers from browsers,
only scripts.

This makes default browser and server-side origin checks consistent
2017-10-11 10:41:29 +02:00
Min RK
a69ddb6655 register contents_manager.files_handler_class directly
rather than trying to call one handler from another,
which is unreliable and can cause misbehavior.
2017-10-11 10:38:47 +02:00
Min RK
a8c6b8bab6 Fix some errors caused by raising 403 in get_current_user (#2919)
get_current_user is called in a few places that really shouldn’t raise

move the raising to `get_login_url`, which is called in `@web.authenticated`,
where we want to replace redirect logic with 403.
2017-10-10 14:43:39 -07:00
Min RK
91469d2672 allow setting token via JUPYTER_TOKEN env
more convenient for certain deployments than CLI arguments
2017-10-10 18:05:45 +02:00
Min RK
e4186c47c0 allow disabling offline message buffering
escape hatch if the new buffering is causing anyone trouble
2017-10-10 11:06:48 +02:00
Kyle Kelley
2ee51ab09f Merge pull request #2913 from gnestor/issue-2203-patch
Update viewable_extensions
2017-10-09 20:05:36 -07:00
Grant Nestor
b82ca09782 Update viewable_extensions 2017-10-09 17:36:01 -07:00
Grant Nestor
5841666647 release 5.2.0rc1 2017-10-09 14:55:34 -07:00
Kyle Kelley
5585fea392 Merge pull request #2912 from gnestor/issue-2904
Show edit shortcuts modal after shortcuts modal is hidden
2017-10-09 14:09:34 -07:00
Kyle Kelley
011270347a Merge pull request #2911 from gnestor/issue-2203
Improve Edit/View behavior
2017-10-09 14:04:47 -07:00
Grant Nestor
d537ef6350 Show edit shortcuts modal after shortcuts modal is hidden 2017-10-09 13:16:24 -07:00
Grant Nestor
2fdc5327e3 Clean up 2017-10-09 11:39:51 -07:00
Grant Nestor
cb8d88e8e5 Add viewable whitelist based on browser-supported file extensions 2017-10-09 11:39:45 -07:00
Grant Nestor
679a1a2985 Normalize inputs before comparing in item_in 2017-10-09 11:39:07 -07:00
Grant Nestor
4de3a4cc61 Default to edit if file type is unknown 2017-10-09 11:38:21 -07:00
Grant Nestor
c0b678c510 Remove editable whitelist 2017-10-09 11:34:25 -07:00
Thomas Kluyver
12592ef3bb The root directory of the notebook server should never be hidden (#2907)
* The root directory of the notebook server should never be hidden

Closes gh-2382

* Test that root dir is not hidden
2017-10-06 10:45:13 -07:00
Kyle Kelley
43a97807fc buffer messages when websocket connection is interrupted (#2871)
* provide some top level comments

* implement buffering of messages on last dropped connection

- buffer is per-kernel
- session_key is stored because only a single session can resume the buffer and we can't be sure
- on any new connection to a kernel, buffer is flushed.
  If session_key matches, it is replayed.
  Otherwise, it is discarded.
- buffer is an unbounded list for now

* restore actual zmq channels when resuming connection

rather than establishing new connections

fixes failure to resume shell channel

* hookup restart callbacks in open

instead of in `create_stream`, which is not called on reconnect

* improve handling of restored connections in js

- dismiss 'connection lost' dialog on reconnect
- set busy status on reconnect (if not busy, idle will come soon after via kernel_ready)
2017-10-06 09:15:06 -07:00
Min RK
9b4660fc43 Merge pull request #2753 from gabyx/master
added path to the resources metadata, the same as in from_filename(...) in nbconvert.exporters.py
2017-10-05 14:57:44 +02:00
jianzi123
de09c12980 Pull request i18n (#2804)
* ...

* ...

* ...

* add translated files in Chinese.

* Remove compiled message files

* Consolidate translations into one set of files

* Rename .pot files to .po

* Add zh-CN to list of supported languages

* Ignore compiled .mo files

* Revert a couple of unimportant changes
2017-10-02 16:02:06 -07:00
Kyle Kelley
82c33578e1 Merge pull request #2887 from jcb91/page_default_args
give Page constructor default arguments
2017-10-01 08:29:38 -07:00
Kyle Kelley
3c4c470a19 Merge pull request #2888 from jcb91/require_config
fix notebook require config to match tools/build-main
2017-10-01 08:25:26 -07:00
Josh Barnes
97d6ead5de fix notebook require config to match tools/build-main
as otherwise, any template based on page will fail to load unless
it already has its own minified js including the dependencies
2017-10-01 15:20:15 +01:00
Josh Barnes
9552fc1872 give Page constructor default arguments
for any extension template which relied on the old no-parameter formation
2017-10-01 14:26:38 +01:00
Kyle Kelley
1cdb41165f Merge pull request #2876 from SamLau95/master
Add x-xsrftoken to Access-Control-Allow-Headers
2017-09-30 16:51:16 -07:00
Kyle Kelley
099f83e11e Merge pull request #2880 from jcb91/codemirror_ruler
fix codemirror.less to match CodeMirror's expected padding layout
2017-09-30 16:36:14 -07:00
Josh Barnes
df19a51f59 fix codemirror.less to match CodeMirror's expected padding layout
fixes #2869 (I hope!)
2017-09-30 02:47:39 +01:00
Sam Lau
1c2a256add Add x-xsrftoken to Access-Control-Allow-Headers
When starting a kernel using the Jupyter Notebook Kernel API, web
browsers will automatically check for the presence of `x-xsrftoken` in
the Access-Control-Allow-Headers during the preflight CORS check
([ref][ref]).

[ref]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers

Since we didn't allow this header before, web browsers would fail the
preflight check even when the x-xsrftoken header isn't being used by the
notebook server.

This meant that running a webpage on localhost:8080 that used Javascript
to start a kernel on a notebook server running on localhost:8888 would
fail.

How I tested this commit:

1. Start a notebook server using

		jupyter notebook --no-browser --NotebookApp.allow_origin="*" --NotebookApp.disable_check_xsrf=True --NotebookApp.token=''

2. Build the [web3](https://github.com/jupyter-widgets/ipywidgets/tree/master/examples/web3) example from ipywidgets.
3. In that directory, run `npm run host`.
4. Verify that visiting http://localhost:8080/ starts a kernel in the notebook server.
2017-09-28 15:42:41 -07:00