mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,703 Commits 20 Branches 1,036 Tags 78 MiB
464967d7a9
Commit Graph

2872 Commits

Author SHA1 Message Date
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
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
fc3178e13e Make order of operations more explicit. 2014-10-21 14:28:28 -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
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
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
Sylvain Corlay
e9ceb94db1 genereate css 2014-10-13 20:32:01 +00:00
Jonathan Frederic
1172876191 Add version trait to Widget base, 
From widget Trello: version numbers for widget models;
when reloaded, will give the widget a chance to do
something intelligent or fail (by default) if the
version number doesn't match.
 2014-10-13 11:52:19 -07:00
Jonathan Frederic
98cef15a7c Merge pull request #6221 from Carreau/cm4 
Switch to CodeMirror 4.6.0
 2014-10-13 10:39:03 -07:00
Jonathan Frederic
6a304fc63c Merge pull request #6540 from takluyver/comms-mgr-needs-no-shell 
Make comm manager (mostly) independent of InteractiveShell
 2014-10-12 16:11:36 -07:00
MinRK
7da61bfc13 use default kernel name in kernels service 
matches sessions API
 2014-10-12 14:59:03 -07:00
MinRK
97f7116624 allow session_id to be undefined when starting kernel channels 2014-10-12 14:55:01 -07:00
Min RK
1b5874ac65 Merge pull request #6629 from minrk/wscookie 
remove on_first_message authentication
 2014-10-12 13:25:52 -07:00
Sylvain Corlay
43d08b0795 fix alignment 2014-10-10 23:19:31 -04:00
Min RK
00f88ee1be Merge pull request #6654 from Carreau/closes-6647 
Have /api return the IPython version
 2014-10-10 11:39:36 -07:00
Bussonnier Matthias
76a54f0a82 Have /api return the IPython version 
return version as a string, to be consistent with other APIs.

closes #6647
 2014-10-10 19:28:04 +02:00
Matthias Bussonnier
87dc17ccbc cleanup style fixed in separate PR and few other things 2014-10-10 19:21:56 +02:00
Matthias Bussonnier
b24e69b058 cleanup whitespace 2014-10-10 19:21:55 +02:00
Matthias Bussonnier
3de3ef9add add comment about codemirror.modeURL 2014-10-10 19:21:55 +02:00
Matthias Bussonnier
c183aa5fe6 remove unused cm_loadmode 2014-10-10 19:21:55 +02:00
MinRK
8e863d951c use require to load CodeMirror modes 
CM's loadmode addon only works if you *don't* load CodeMirror itself with require.
 2014-10-10 19:21:55 +02:00
MinRK
7aed2fbb55 fix this.editor reference 2014-10-10 19:21:55 +02:00
Matthias Bussonnier
dc912dbdbd handle somehting selected and multiple cursors and 4 tabs show content in pager 2014-10-10 19:21:50 +02:00
Matthias Bussonnier
e0f19a386e protect agains undefined 2014-10-10 19:18:57 +02:00
Matthias Bussonnier
804d89351b rework keyboard management to avoit completer and up/down bugs 2014-10-10 19:18:56 +02:00
Matthias BUSSONNIER
5b355936df Update to codemirror 4 
Update to codemirror 4.6 and update most notebook to work wiht it
this include keyevent that where triggerd twice and the re-writing of
ipython-gfm anf ipython mode to work with require.
 2014-10-10 19:18:56 +02:00
Jonathan Frederic
262bf7d2c9 Merge pull request #6673 from jhamrick/fix-tooltip 
Fix broken show in pager button
 2014-10-10 08:31:25 -07:00
Jessica B. Hamrick
685040427a Fix broken show in pager button 2014-10-09 18:34:22 -07:00
MinRK
624f0071a2 remove on_first_message authentication 
in ZMQStreams. No need for weird, special first message.

- use regular cookie auth
- use url param for session id
 2014-10-09 15:12:20 -07:00
Min RK
63a7969123 Merge pull request #6416 from Carreau/foobarcode 
Unify Text/CodeCell code.
 2014-10-09 15:00:15 -07:00
Min RK
60bfcf8c74 Merge pull request #6665 from jdfreder/travis_please_run_on_this 
Separate widget model name from com target name.
 2014-10-09 11:45:41 -07:00
Jonathan Frederic
4b968ece0b s/target_name/model_name 2014-10-09 10:55:46 -07:00
Matthias BUSSONNIER
9657a3f7cd Generalise render/unrender to all cells type 
Allow change of behavior in pure (custom) css.
 2014-10-09 12:14:56 +02:00
Matthias Bussonnier
b2a0798fdf Merge pull request #6598 from minrk/nbformat-backport 
nbformat validation
 2014-10-09 11:58:56 +02:00
Matthias Bussonnier
a8949405da Merge pull request #6644 from minrk/trust-changed 
trigger trust_changed properly on load
 2014-10-09 11:10:59 +02:00
Matthias Bussonnier
65f41327c9 Merge pull request #6106 from chronitis/interact-slider-textedit 
Allow text input on slider widgets
 2014-10-09 11:09:47 +02:00
Matthias Bussonnier
7d7b85a043 Merge pull request #6649 from minrk/302-notebooks 
redirect /api/notebooks to /api/contents
 2014-10-09 10:52:48 +02:00
Matthias Bussonnier
fa11da9162 Merge pull request #6586 from jhamrick/kernel-session-js 
Kernel and session javascript cleanup
 2014-10-09 10:45:50 +02:00
Jonathan Frederic
24096b0f45 Separate widget model name from com target name. 2014-10-08 21:31:00 -07:00
MinRK
b87fee048c redirect /api/notebooks to /api/contents 
eases 2.x-3.x transition for consumers such as emacs-ipython-notebook
 2014-10-08 12:33:43 -07:00
MinRK
b2d946d44e don't convert notebooks on upload 2014-10-08 12:33:34 -07:00
MinRK
8392c7ac9e don't check_and_sign old notebooks on upload 2014-10-08 12:33:34 -07:00
MinRK
4ae05c729c trust is stored in code_cell.metadata 
not top-level code_cell
 2014-10-08 12:33:33 -07:00
MinRK
ddd3aa2a5a add dialogs for failed save/load 
- failed validation doesn't prevent save/load,
  but the user is now warned about it.
- there is now a warning dialog if fromJSON fails,
  rather than the usual silent failure.
 2014-10-08 12:33:32 -07:00
Min RK
633b315a87 Merge pull request #6658 from Carreau/less-175 
pin less to less than 1.7.5
 2014-10-08 12:10:41 -07:00
Jessica B. Hamrick
b650c56a66 One more this/that change 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
bbb9edf374 Fix bugs with this and that 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
37c2419c5e Rename all status_event to kernel_event 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
40ebe5d816 Make kernel dialogs be a special type of dialog 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
8f28134a89 Keep trying to reconnect 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
205a35ceec Fix equals sign and clarify where the number of restart attempts comes from 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
e5a5bdcdd3 Handle and test for failed restart in session.js 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
29e6885b60 Test for autorestart and failed autorestart 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
f2ad4fc176 Better way to wait inbetween tests 2014-10-08 11:30:32 -07:00
Jessica B. Hamrick
fe2402f99d Increase wait time between tests 2014-10-08 11:30:31 -07:00
Jessica B. Hamrick
7f8b95a661 Add status_ready.Kernel event and rename status_started to status_created 2014-10-08 11:30:31 -07:00
Jessica B. Hamrick
dea6b85f3c Fix bug when clicking notification for kernel_dead.Session 2014-10-08 11:30:31 -07:00
Jessica B. Hamrick
504f0b4d9d Add docstring to Session.restart 2014-10-08 11:30:31 -07:00