mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-11 12:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,759 Commits 22 Branches 1,062 Tags 80 MiB
1e53c1f924
Commit Graph

4713 Commits

Author SHA1 Message Date
KesterTong
952ac7d0d8 Moves load_notebook to ContentManager and adds new_notebook to Google Drive version 2014-11-03 10:17:12 -08:00
KesterTong
e3ef5d3b70 Moves list_notebooks to ContentManager 2014-11-03 10:17:12 -08:00
KesterTong
dfcf14f26c Uses events for ContentManager.save_notebook 
Modifies ContentManager.save_notebook() to use events, so that the Notebook instance can listen for success or failure events.  Also moves some logic out of save_notebook()
 2014-11-03 10:17:12 -08:00
KesterTong
04fc61285f Use events for rename_notebook 
Triggers events on ContentManager.rename_notebook success and failure.  Also moves some logic out of this method.
 2014-11-03 10:17:12 -08:00
KesterTong
75d7e69fc8 Use $.proxy instead of that 2014-11-03 10:17:12 -08:00
KesterTong
9881d17bb1 Remove unused event 
This event never seems to get used.
 2014-11-03 10:17:12 -08:00
KesterTong
61a911fc0c Fix constructor comments 
Add content_manager as a dictionary key to the options param passed in to the NotebookList and Notebook constructors.
 2014-11-03 10:17:12 -08:00
KesterTong
0aada3ac5d Remove deleted notebook from notebook list 
Uses events to notify the NotebookList when the content manager deletes a notebook, and remove the deleted notebook in response to such an event.
 2014-11-03 10:17:12 -08:00
KesterTong
077ba397c1 Removes unnecessary parameter from ContentManager.delete_notebook 2014-11-03 10:17:12 -08:00
Jeff Hemmelgarn
99323b1173 Move saving to contentmanager 
Make notebook.save_notebook call contentmanager.save_notebook.
 2014-11-03 10:17:12 -08:00
Jeff Hemmelgarn
5b5e194082 Move notebook.rename to contentmanager 
Make notebook.rename call contentmanager.rename
 2014-11-03 10:17:12 -08:00
Jeff Hemmelgarn
7043aa1b9e switch notebook.delete to use contentmanager 
Make notebook.delete call contentmanager.delete_notebook
 2014-11-03 10:17:12 -08:00
Jeff Hemmelgarn
728c6f005f Move deleting a notebook to contentmanager.js 
Move code to handle deleting a notebook from notebooklist to
contentmanager.
 2014-11-03 10:17:12 -08:00
KesterTong
993833d018 Replace other methods with ContentManager.new_notebook 
Replaces Notebook.new_notebook and NotebookList.new_notebook with ContentManager.new_notebook
 2014-11-03 10:17:11 -08:00
KesterTong
d17ca85f5b Adds dialog on new_notebook failure 
This logic doesn't really belong in ContentManager.  It would be better to trigger an event, which is handled somewhere else.  But there's no obvious place to put this event, so creating the error dialog inside the new_notebook method is ok for now.
 2014-11-03 10:17:11 -08:00
KesterTong
5717a3eb10 Make ContentManager stateless 
Don't store notebook_path in ContentManager, because this sort of state (in addition to notebook_name) can change, and keeping track of this logic doesn't seem to be a part of the file management system.  Instead, this logic can be left to the Notebook instance (and possible other places that manage it).  This makes refactoring easier, and avoids having to replicate this logic in every implementation of ContentManager.
 2014-11-03 10:17:11 -08:00
KesterTong
99f2647edd Use IPython style constructor 2014-11-03 10:17:11 -08:00
KesterTong
21a5b5a965 Style and bug fixes 2014-11-03 10:17:11 -08:00
jhemmelg
112a74c566 ContentManager function signatures updated 2014-11-03 10:17:11 -08:00
jhemmelg
d5a84bb8a4 Initial interface for javascript contentmanagers 
contentmanager.js is going to be a js proxy for the current
filenbmanager.py.  This will allow a contentmanager for Google Drive to
be created.
 2014-11-03 10:17:11 -08:00
Thomas Kluyver
a16a3d0270 Merge pull request #6045 from minrk/nbformat4 
nbformat v4
 2014-11-03 09:58:33 -08:00
Min RK
96183a60a0 create new terminals with POST /api/terminals 
instead of GET terminals/new

to be consistent with creating new notebooks.

We had to stop using GET notebooks/new
because browsers would create new notebooks when making preview thumbnails for commonly visited pages, etc.
I assume the same issue would apply to terminals
 2014-11-02 11:09:03 -08:00
Min RK
196b91e73b Merge pull request #6828 from takluyver/terminal-list 
Add terminals tab to the dashboard
 2014-11-02 10:46:31 -08:00
Min RK
525f6a7561 fix backward f, nb args for nbformat.write 2014-11-01 16:41:13 -07:00
MinRK
7cf53c998c restore ability to sign v3 notebooks 2014-11-01 16:41:13 -07:00
MinRK
53ef8e1e1e remove unused OuptutArea.rename_keys 2014-11-01 16:41:12 -07:00
MinRK
af735018f3 don't use nbformat.current in IPython.html 
use top-level nbformat.read/write, v4 directly for compose
 2014-11-01 16:41:11 -07:00
MinRK
ae0b46aa3f address review from takluyver 
- various typos
- discuss multi-line strings in nbformat doc
- testing cleanup
- py3compat simplification
- don't use setdefault when composing notebook nodes
- mime-type fix in svg2pdf
 2014-11-01 16:41:09 -07:00
MinRK
12f94ae2a2 use from_dict for dict->notebook 
not confusing to_notebook_json
 2014-11-01 16:41:09 -07:00
MinRK
d979f4bedd better regex replacement for MarkdownCell.set_heading_level 
(c/o Matthias)
 2014-11-01 16:41:07 -07:00
MinRK
dd95b1ef5f remove heading cells in v4 2014-11-01 16:41:07 -07:00
MinRK
458dcd12e3 make markdown heading input match output size 2014-11-01 16:41:06 -07:00
MinRK
6ca260e611 output[mime/type] -> output.data[mime/type] in javascript 2014-11-01 16:41:05 -07:00
MinRK
a50042745f semicolons, you guys! 2014-11-01 16:41:05 -07:00
MinRK
baf65234b9 move mime-bundle data to rich output.data 
from top-level output keys
 2014-11-01 16:41:04 -07:00
MinRK
09acc6c854 msgspec: stream.data -> stream.text 2014-11-01 16:41:04 -07:00
MinRK
14cfb2efc1 s/prompt_number/execution_count in nbformat 4 2014-11-01 16:41:03 -07:00
MinRK
07079095a8 update html/js to nbformat 4 2014-11-01 16:41:02 -07:00
Min RK
3e82ea8319 actually send only one kernel_info request 
store the Future for the initial request,
allowing subsequent requests to wait on the same pending reply.

Previously, any incoming requests that arrived while waiting for the first reply would send their own request.
 2014-11-01 13:38:55 -07:00
Matthias Bussonnier
63d4534959 Get pre_get to work and make session logs when adapter changes 2014-11-01 19:39:40 +01:00
Thomas Kluyver
8e1914a446 Merge pull request #6825 from minrk/bad-kernelspecs 
log kernel specs that fail to load
 2014-10-31 18:05:37 -07:00
Thomas Kluyver
d32322e332 Show terminals as terminals/name 
Bigger click target
 2014-10-31 17:28:51 -07:00
Thomas Kluyver
4025b57ed8 Only display terminals in dashboard if terminals are available 2014-10-31 15:56:53 -07:00
Min RK
1d7f8803e0 use ?download=1 to trigger download in /files/ 
sets `Content-Disposition: attachment...`

- master sets this unconditionally
- 2.x sets this iff file is a notebook
 2014-10-31 15:45:30 -07:00
Thomas Kluyver
65e664b143 Add list of available terminals in the dashboard 2014-10-31 15:42:52 -07:00
Min RK
e329a79bc8 language is removed from kernel specs 
don't use it when testing kernel spec API
 2014-10-31 15:09:51 -07:00
Min RK
a2575af6a7 log kernel specs that fail to load 2014-10-31 15:03:30 -07:00
Matthias Bussonnier
1281319cc9 Merge pull request #6820 from takluyver/terminals-tornado-3 
Fix terminals with Tornado 3
 2014-10-31 19:23:41 +01:00
Thomas Kluyver
ce14f905e0 Fix terminals with Tornado 3 
The websocket handler auth checking was calling clear_cookie(), which
threw an error because it doesn't make sense for Websockets. It doesn't
seem important, and we silence it in our other websocket handlers, so
silencing it here too.
 2014-10-30 18:38:31 -07:00
Thomas Kluyver
db6cd028ea Merge pull request #6793 from takluyver/langinfo 
Move language info from kernelspec to kernel_info_reply
 2014-10-30 16:15:19 -07:00
Thomas Kluyver
adeefa8578 Merge pull request #6493 from SylvainCorlay/python_widget_registry 
Creating a widget registry on the Python side.
 2014-10-30 16:10:50 -07:00
Min RK
965102ba60 Merge pull request #6554 from Carreau/itsallaboutme 
Add About IPython
 2014-10-30 14:23:16 -07:00
Scott Sanderson
b4c5755ad4 BUG: Set file encoding for IPython.html.terminal.handlers. 2014-10-30 02:43:22 -04:00
Sylvain Corlay
ed5e602950 jupyter -> IPython 2014-10-29 21:52:03 -04:00
Sylvain Corlay
374459e5e7 Adding custom keys for core jptr notebook 2014-10-29 21:52:03 -04:00
Sylvain Corlay
18e77a090a registering core widgets 2014-10-29 21:52:03 -04:00
Sylvain Corlay
e5b347804a widget registry 2014-10-29 21:52:03 -04:00
Thomas Kluyver
1abce7c065 Merge pull request #6807 from minrk/debug-ws-open 
debugging websocket connections
 2014-10-29 18:13:19 -07:00
Min RK
5ff9ded54a Merge pull request #6614 from takluyver/nb-terminal-ui 
Terminal emulator in the notebook
 2014-10-29 12:35:29 -07:00
Min RK
e5b135a905 debugging websocket connections 
- add debug statement at the very beginning of a web socket request
- add debug statement in open, indicating that the connection has been accepted
- add timeout, so failed or slow kernel_info doesn't cause the request to never get a response
- don't send kernel_info_request before authenticating the request

The last one required some icky coroutine shenanigans,
because of our subclass structure, but it should work fine.
 2014-10-29 09:17:52 -07:00
Mateusz Paprocki
3d825cfbcc Allow to specify CodeMirror's syntax mode as MIME 
This is required for e.g. Scala, where the mode is given as
text/x-scala, but the actual implementation is in clike mode.
This wouldn't be an issue, but IPython loads modes lazily, so
you need both mode name and MIME to resolve correct file and
configure CodeMirror.
 2014-10-29 16:57:57 +01:00
Bussonnier Matthias
5ecf6efdac cache sys-info 2014-10-29 14:55:12 +01:00
Jonathan Frederic
ba77877c18 Rebase fixes 2014-10-28 17:55:36 -07:00
Jonathan Frederic
04d0874a80 JS test fix 2014-10-28 16:49:46 -07:00
Jonathan Frederic
db10ae8f2d s/target_name/widget_class 2014-10-28 16:49:46 -07:00
Jonathan Frederic
cb2c76999c Address some more review comments... 2014-10-28 16:49:46 -07:00
Jonathan Frederic
3cb5ac6fbb Clarified API for the create_model function, 
Also added a test!
 2014-10-28 16:49:46 -07:00
Jonathan Frederic
a68df8a8b1 Address @minrk 's review comments. 2014-10-28 16:49:46 -07:00
Jonathan Frederic
fbca0bfa3f Rebase fixes. 2014-10-28 16:49:45 -07:00
Jonathan Frederic
5a655b24da Fixed typo. 2014-10-28 16:49:45 -07:00
Jonathan Frederic
2b5ebb9e8f Make Python push initial state. 
Also added initial state push callback.
 2014-10-28 16:49:45 -07:00
Jonathan Frederic
e7ee9c12b3 Enable widget instanciation from front-end. 2014-10-28 16:44:02 -07:00
Min RK
b26706ba69 Merge pull request #6800 from takluyver/mdcell-render-event 
Add event for Markdown cell rendered
 2014-10-27 20:04:26 -07:00
Min RK
e5aa7ef70b Merge pull request #6763 from takluyver/require-widget-models-comm-targets 
Load comm targets and widget models from requirejs modules
 2014-10-27 19:59:41 -07:00
Thomas Kluyver
659accf69e Add event for Markdown cell rendered 2014-10-27 17:39:24 -07:00
MinRK
a5a43e2746 Don't resend kernel info requests if a bad reply is received 2014-10-26 19:06:48 -07:00
MinRK
94d6196ef9 add websocket workarounds for tornado 3 
WebSocketHandler.get is new in tornado 4
 2014-10-26 19:06:48 -07:00
MinRK
769fe38789 cache kernel_info reply for protocol adaptation 
WebSocket connections will not open until kernel_info is retrieved,
removing a race condition waiting for the reply to indicate adaptation,
which could result in a v5 message being sent to a v4 kernel.
The reply is cached, so that it need not be requested on each new connection.
 2014-10-26 14:48:55 -07:00
Thomas Kluyver
c8af873aeb Remove override.css from the template 2014-10-25 17:15:50 -07:00
Thomas Kluyver
ea896c3f16 Compatibility fix for Tornado 3.x 2014-10-25 17:15:49 -07:00
Thomas Kluyver
8917e9951e Move terminal CSS into LESS file 2014-10-25 17:15:36 -07:00
Thomas Kluyver
d352d52bd8 Add comment explaining 1.02 factor 2014-10-25 17:15:36 -07:00
Thomas Kluyver
52be8bdf6b HTML fix 2014-10-25 17:15:36 -07:00
Bussonnier Matthias
1b200e5504 recompute dummy size dynamically + styling in css 2014-10-25 17:15:36 -07:00
Thomas Kluyver
1db2868d37 Use relative URL for redirect in NewTerminalHandler 2014-10-25 17:14:40 -07:00
Thomas Kluyver
7ee896861c Don't load html.terminal for tests if terminado not installed 2014-10-25 17:14:40 -07:00
Thomas Kluyver
a907d8f7f4 Put terminal handlers under base_url 2014-10-25 17:14:40 -07:00
Thomas Kluyver
cbc70a7de7 Add authentication for terminal websockets 2014-10-25 17:14:40 -07:00
Thomas Kluyver
b929b3f09e Initial REST API for terminals 2014-10-25 17:14:40 -07:00
Thomas Kluyver
9c0084e615 Multiple terminals and conditional initialisation 2014-10-25 17:14:40 -07:00
Thomas Kluyver
d4676bf2ad Terminal basically working 
Still need to deal with things like authentication
 2014-10-25 17:14:40 -07:00
Thomas Kluyver
d211ebf067 Basic infrastructure for terminal page 2014-10-25 17:14:39 -07:00
Thomas Kluyver
9c7d73a05e Move language info from kernelspec to kernel_info_reply 2014-10-24 16:24:24 -07:00
Thomas Kluyver
a77b5e8e31 Support specifying requirejs modules for comm targets 2014-10-24 12:15:55 -07:00
Thomas Kluyver
031530da42 Support specifying requirejs modules for widget models 2014-10-24 12:14:43 -07:00
Min RK
a58b215421 Merge pull request #6768 from jdfreder/remotetestfix 
Fix an issue in the `kernel_running` function of the JS tests,
 2014-10-21 17:14:05 -07:00
Jonathan Frederic
880e7be68a Merge pull request #6766 from takluyver/i6764 
Open ipynb download in a new window instead of changing the URL
 2014-10-21 16:46:32 -07:00
Jonathan Frederic
5366cef17d Fix an issue in the kernel_running function of the JS tests, 
This fix allows the JS test to be ran against a remote server
with a higher than LAN latency.  This bug in our testing
framework was exposed when running `iptest js/widgets --url`
against tmpnb.
 2014-10-21 16:43:30 -07:00
Thomas Kluyver
5ede5318d5 Merge pull request #6751 from jdfreder/iptestgun 
Added --url option to iptest
 2014-10-21 15:18:34 -07:00
Thomas Kluyver
eacd05505c Open download in a new window instead of changing the URL 
Closes gh-6764
 2014-10-21 14:54:58 -07:00
Jonathan Frederic
157e51f882 Last review comments? 2014-10-21 14:54:32 -07:00
Jonathan Frederic
fc3178e13e Make order of operations more explicit. 2014-10-21 14:28:28 -07:00
Jonathan Frederic
d33d55bcd8 Review comments 2014-10-21 13:46:13 -07:00
Jonathan Frederic
79670e8afb Merge pull request #6494 from takluyver/widget-comm-require 
Allow widget views to be loaded from require modules
 2014-10-21 10:11:41 -07:00
Jonathan Frederic
c3b1bf795e Add --url option to iptest 2014-10-20 20:29:01 -07:00
Thomas Kluyver
f0f6c0d29b Merge pull request #6677 from minrk/services 
remove unnecessary 'js' subdir from services
 2014-10-20 11:21:53 -07:00
Thomas Kluyver
c39939869f Merge pull request #6653 from mattpap/fix_ansispan 
Fix IPython.utils.ansispan() to ignore stray [0m
 2014-10-20 09:19:00 -07:00
Mateusz Paprocki
61c17c8ef6 Update static/style/{ipython,style}.min.css 2014-10-20 11:25:09 +02:00
Mateusz Paprocki
439098a9d5 IPython.{util->utils}.fixConsole() in html/tests/base 2014-10-20 11:12:10 +02:00
MinRK
a67abc297d remove unnecessary 'js' subdir from services 
part of the point of services is that they are just code, so they won't have js/less/etc. files.
 2014-10-19 15:40:50 -07:00
Matthias Bussonnier
103d5dc9b7 Merge pull request #6720 from takluyver/kernelspec-pygments-lexer 
Respect kernelspec metadata for syntax highlighting in nbconvert
 2014-10-19 11:11:03 +02:00
Matthias Bussonnier
d269912958 Merge pull request #6110 from minrk/binarycomm 
support binary buffers in comm messages
 2014-10-19 11:03:24 +02:00
MinRK
7fd161599b cleanup serialize per review 2014-10-18 19:04:57 -07:00
MinRK
ab9e2b496d move grid-float-breakpoint to 540px 
collapses navbar before running over to two lines
due to help/indicator collision.
 2014-10-18 18:21:07 -07:00
MinRK
e36df49c5f tweak collapsed navbar style 
- notification and indicators appear above menu on small screen
- collapsed menu button floats left
 2014-10-18 18:21:07 -07:00
MinRK
5ccbd18e5d collapse the navbar on narrow windows 
so it doesn't take up a bunch of vertical height when not in use
 2014-10-18 18:21:07 -07:00
MinRK
36cd457b11 move the navbar-collapse transition to xs 
avoids stacked navbar on narrow (but not too narrow) windows
 2014-10-18 18:21:06 -07:00
Matthias Bussonnier
197c66d0d5 Use native map when possible 
Implemented on all modern browser.

There is a small behavior difference between $.map and Array.prototype.map
but we don't rely on it.

(jQuery flatten arrays and filters null-like)
 2014-10-18 20:09:34 +02:00
Matthias Bussonnier
7ae250bbeb Merge pull request #6693 from minrk/please-no-jsonp 
set contentType='application/json'
 2014-10-17 14:17:20 +02:00
Matthias Bussonnier
3b31574971 Merge pull request #6697 from minrk/less-1.7.5 
require less >= 1.7.5
 2014-10-17 14:15:54 +02:00
Thomas Kluyver
ddbe427dfa Add pygments_lexer key to kernelspec 2014-10-16 15:28:02 -07:00
Matthias Bussonnier
bd8413dfc7 Use low overhead object heritence in Js (Object.create vs new) 
the use of

    XX.prototype = new YY();

Does trigger the constructor of YY without the nead for it. `Object.create`
does go around this limitation and target browser that are relatively Old.

Cf https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create

for more info

It might help to get rid of some logic in constructors that check wether some
options are passed in, that were causing errors on noteboko load.  Typically
`if(element){ }` on Abstract  `Cell` constructor.
 2014-10-16 21:20:35 +02:00
MinRK
492b80d05f require less >= 1.7.5 
fixes bug where `vbox > *` style was applied to `vbox()` classes
 2014-10-16 11:07:14 -07:00
MinRK
95355e6ff2 Merge pull request #6624 
closes #6656
closes #6399
 2014-10-16 10:18:21 -07:00
Jonathan Frederic
356743495b Merge pull request #6666 from jdfreder/widget_numbers 
Add version trait to Widget base,
 2014-10-16 09:45:12 -07:00
MinRK
868994087f finish up FilesHandler 
- load FilesHandler like everything else
- remove copy/paste leftovers
 2014-10-16 09:26:27 -07:00
Thomas Kluyver
fddccc08de Merge pull request #6711 from minrk/invoke 
use invoke instead of fabric
 2014-10-16 09:19:41 -07:00
Matthias Bussonnier
6766daa397 Merge pull request #6705 from jhamrick/celltoolbar-justify 
Right-justify celltoolbar instead of reversing
 2014-10-16 17:09:07 +02:00
Matthias Bussonnier
e7c2c369e0 Add about dialog in Notebook Help Menu. 
This allow to get info on version of IPython when running remotely.
The about dialog also send a kernel info request and display the banner
which is useful for non-python kernel that don't match IPython version
 2014-10-16 17:04:19 +02:00
MinRK
920d49593c refuse to run js tests with phantom + tornado 4 
websocket connections fail with 426 because phantomjs implements a super old draft of webosockets that recent tornado doesn't support

This refused to run in that situation with an informative message.
 2014-10-15 17:38:59 -07:00
MinRK
7c2083aa60 test saving with problematic cell contents 2014-10-15 16:57:18 -07:00
MinRK
2624f82787 set contentType='application/json' 
instead of skipping straight to headers

avoids jQuery's crazy JSONP detection on `=.*??`,
which was triggered because it assumed the contentType was unspecified,
and thus should be guessed based on content.
 2014-10-15 16:57:18 -07:00
MinRK
41cfd4f5cf use invoke instead of fabric 
it's the descendant of the part of fabric we actually use,
it doesn't have complex compiled dependencies like fabric,
and it works on Python 3.
 2014-10-15 16:53:07 -07:00
Jessica B. Hamrick
8896b538b5 Add regression tests for live notebook 2014-10-15 12:46:23 -07:00
MinRK
9e425bf94b move binary msg test to services/serialize 2014-10-15 12:23:33 -07:00
MinRK
8c743d304f unsigned ints for offsets 
because signed ints for sizes is icky
 2014-10-15 12:23:33 -07:00
MinRK
11f5775103 test binary websocket messages 
only runs on slimerjs for now
 2014-10-15 12:23:33 -07:00
MinRK
3de7e9bd74 test websocket-friendly binary message roundtrip 
Python-side
 2014-10-15 12:23:33 -07:00
MinRK
b548e51550 use TextEncoding for string<->ArrayBuffer 
requires text-encoding js polyfill, for now
 2014-10-15 12:23:32 -07:00
MinRK
3693ac83ae support binary message from javascript 2014-10-15 12:23:32 -07:00
MinRK
6cef7fcb86 use utf8.js 
move message serialization to kernel.serialize module
 2014-10-15 12:23:32 -07:00
MinRK
c9c131ebf9 s/unserialize/deserialize 2014-10-15 12:23:32 -07:00
MinRK
3a1c845f96 support buffers in comm messages 
- add buffers arg to comm Python api
- support binary websocket messages when buffers are present
- reimplement utf8 in javascript, because javascript is the best
 2014-10-15 12:23:31 -07:00
Jessica B. Hamrick
b68507ae91 Display prompt in the notebook correctly 2014-10-15 12:12:07 -07:00
Jessica B. Hamrick
8294a5938b Right-justify celltoolbar instead of reversing 2014-10-15 12:11:48 -07:00
Jonathan Frederic
c0108e1089 Merge pull request #6681 from SylvainCorlay/widget_hbox_align 
Minor change in widgets.less to fix alignment issue
 2014-10-14 14:33:53 -07:00
Min RK
8107e8a41b Merge pull request #6669 from SylvainCorlay/font_awesome_update 
Font awesome update
 2014-10-14 11:37:42 -07:00
Thomas Kluyver
0b7cbae7e0 Merge pull request #6685 from minrk/allow-no-session-id 
allow session_id to be undefined when starting kernel channels
 2014-10-14 11:35:44 -07:00
MinRK
3946dedbda remove redundant 'responsive-utilities' from style.less 
it's already included in bootstrap.less
 2014-10-13 21:18:24 -07:00
Thomas Kluyver
74d2ddf751 Merge pull request #6686 from minrk/default-kernel 
use default kernel name in kernels service
 2014-10-13 13:57:44 -07:00