mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-06 11:35:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,929 Commits 19 Branches 1,023 Tags 78 MiB
7d8fe7e37d
Commit Graph

4013 Commits

Author SHA1 Message Date
Brian E. Granger
372507e3f1 Merge pull request #6128 from jasongrout/widget-trait-serialization 
Widget trait serialization
 2014-07-23 14:13:24 -07:00
Sylvain Corlay
cd7942eb06 renaming once_displayed into after_displayed 2014-07-23 20:26:44 +00:00
Jason Grout
8fb0ae4d36 Change serialize/deserialize to to_json/from_json 2014-07-23 20:22:50 +00:00
Sylvain Corlay
cfc4a62a85 one more bit 2014-07-23 20:15:37 +00:00
MinRK
957fb42680 use global events in js tests 2014-07-23 11:06:03 -07:00
MinRK
9ff7d264ab note loaded, unused dependencies in require 2014-07-23 11:06:01 -07:00
MinRK
c72cd05cf3 fix docstring in events.js 
example shows registering a handler, not triggering an event.
 2014-07-23 11:05:36 -07:00
MinRK
e9da9fd776 don’t load custom.js in page template 
we are loading it in require, and don’t want to load it twice
 2014-07-23 11:05:36 -07:00
MinRK
4097da724b preserve backward-compatible $([IPython.events]) 2014-07-23 11:05:36 -07:00
Jason Grout
abf86d5324 Trigger app_initialized event *after* the 'global' IPython object is initialized 2014-07-23 11:05:34 -07:00
MinRK
374518c583 don’t use events !== undefined to signal page ready 
it will always be defined
 2014-07-23 11:05:06 -07:00
MinRK
b1291df14a return global events from require(['base/js/events']). 
In master, it is impossible to load code on IPython events without setting timeouts.
 2014-07-23 11:05:06 -07:00
Min RK
2fe0687097 Merge pull request #6149 from jasongrout/less-upgrade 
Less upgrade
 2014-07-23 10:06:42 -07:00
Matthias Bussonnier
cb810bad86 Merge pull request #6190 from minrk/bootstrap-shim 
add bootstrap shim for require
 2014-07-23 16:59:59 +02:00
MinRK
d345546d15 add bootstrap shim for require 
it was possible for bootstrap js to load before jquery,
causing failures in the dashboard.
 2014-07-22 15:53:16 -07:00
MinRK
137f98014a pass ws_url to kernel constructor 
via session constructor via notebook constructor…
 2014-07-22 15:24:20 -07:00
MinRK
a643de41d8 test coalesced output in js 2014-07-22 15:21:15 -07:00
MinRK
e17c636e18 coalesce stream output in the notebook 
This merges consecutive outputs on one stream into a single output.

Essentially, it applies the same merging that we do visually to the content stored in the notebook document.

This results in a massive performance improvement in load-time and storage size
for notebooks that have many calls to `sys.stdout.flush()`.
 2014-07-22 15:21:14 -07:00
MinRK
579f5101f0 restore websocket_url configurable 
allows ws to be handled via separate proxies,
as appears to be the case on OpenShift and some other hosting services.
 2014-07-22 14:43:40 -07:00
Jason Grout
ab9e4b600e Add a requirejs shim for highlight.js 
Before this, highlighting code in markdown cells was broken since hljs wasn't available.

A better solution might be to build the highlight.js amd module (i.e., build the highlight.js module with `--target=amd`) so that we don't need the shim.
 2014-07-22 20:49:52 +00:00
Jason Grout
97141c6bca Simplify the code for picking json serialization functions to expose the logic better 2014-07-22 15:21:28 +00:00
Jason Grout
4c5f4e750a Compile less files 2014-07-22 14:50:11 +00:00
Jason Grout
33f256a195 abstract hard-coded style values to be variables for different theming 2014-07-22 14:46:59 +00:00
MinRK
112c4083e9 add comments for style blocks in less 
separates each component into individual line in compiled css,
reducing some churn in minified css files.
 2014-07-22 14:46:59 +00:00
Jason Grout
02a8ab2cf5 Upgrade less and generate sourcemap files 2014-07-22 14:46:59 +00:00
Sylvain Corlay
b4d5094645 correction in widget.js 2014-07-22 14:36:22 +00:00
Matthias Bussonnier
f3e599e0c4 Merge pull request #6160 from parleur/patch-2 
Span in CellToolBar instead of div
 2014-07-22 14:44:19 +02:00
Matthias Bussonnier
e4e50628c0 Merge pull request #6127 from minrk/fix-edit-md 
cell toolbar and modal dialog fixes
 2014-07-22 13:12:54 +02:00
Jonathan Frederic
c1c03a1c83 Merge pull request #6153 from jasongrout/container-children-arg 
Make Container widgets take children as the first positional argument
 2014-07-21 13:18:49 -07:00
MinRK
98ac874131 cell toolbar and modal dialog fixes 
- name conflict in modal
- cell.cell_type in cell toolbar

prevented edit metadata from working properly.
 2014-07-21 11:11:53 -07:00
Min RK
3e66b9f52c Merge pull request #6174 from Carreau/pagemain 
remove pagemain.js
 2014-07-20 13:28:30 -07:00
Min RK
70bc0704c2 Merge pull request #6099 from takluyver/check-nbservers-pid 
Check process existence when listing nbserver processes
 2014-07-20 13:20:48 -07:00
Matthias BUSSONNIER
17afb5a71f remove pagemain.js 
It does not seem to be usefull anymore.

The different main.js of /tree /notebook /etc do create an instance of
`page` themselves, error pages do have hardcoded styles that show header
and sites.
 2014-07-20 21:40:14 +02:00
Tarun Gaba
fb540c52f5 Added jquery in define 2014-07-19 09:10:12 +05:30
Sylvain Corlay
a2e9d90bd0 incorrect comment 2014-07-18 22:28:08 +00:00
Sylvain Corlay
8bc4ea37a1 unnecessary context variable specify 2014-07-18 22:26:21 +00:00
Sylvain Corlay
1eb2a30efb once-displayed 2014-07-18 22:08:17 +00:00
Jason Grout
3235f42d12 Container assumes the children attribute is not None 
Thanks to @SylvainCorlay for pointing this out.
 2014-07-18 16:59:41 +00:00
Pierre Gerold
ac6808b884 Update celltoolbar.js 
I want to write an extension with multiple select bar. They are supposed to be displayed inline, not in block mode. The better way is to use span instead of div.
 2014-07-18 12:44:23 +02:00
Jason Grout
06084e996c Change serialization terminology to serialize/deserialize 2014-07-17 20:57:10 +00:00
Jason Grout
eed0715a09 Prepend a sentinel value to model ids to distinguish them from normal UUIDs (from Sylvain Corlay). 2014-07-17 20:55:27 +00:00
Jason Grout
14f3897b56 Make Container widgets take children as the first positional argument 
This makes creating containers less cumbersome: Container([list, of, children]), rather than Container(children=[list, of, children])
 2014-07-17 20:07:37 +00:00
MinRK
792f21be5a remove rackcdn https workaround for mathjax cdn 
cdn.mathjax.org works over https now
 2014-07-14 15:55:36 -07:00
Min RK
748bcd67e0 Merge pull request #6120 from rgbkrk/no_iframe_embedding 
Only allow iframe embedding on same origin by default.
 2014-07-14 15:48:42 -07:00
Jonathan Frederic
20045a2f85 Merge pull request #6115 from SylvainCorlay/widget-area-show 
Instances of WidgetView do not trigger widget_area.show anymore.
 2014-07-14 12:09:54 -05:00
Jason Grout
0c72fddaba Update widget serializer/unserializer to allow custom serialization on a trait-by-trait basis. 
Serializers/unserializers are given as the trait metadata keys `to_json` and `from_json`.
 2014-07-12 23:32:34 -05:00
rgbkrk
88e52b2746 Only allow iframe embedding on same origin. 2014-07-12 00:20:24 -05:00
Min RK
7ce5bb8a37 Merge pull request #6026 from takluyver/kernelspec-rest-launching 
Kernelspecs in REST API for kernels and sessions
 2014-07-11 16:58:31 -05:00
Thomas Kluyver
5afc070910 Add default_kernel_name class level variable 2014-07-11 15:27:36 -05:00
Adam Hodgen
c695ba45bc Remove / from route of TreeRedirectHandler. 
When base_url is set, navigating to http://{url}/{base_url} returns 404
This is due to the TreeRedirectHandler only picking up
http://{url}/{base_url}/ and the trailing slash handler being set to
{base_url}/.*/.

This change will cause http://{url}/{base_url} to correctly redirect to
http://{url}/{base_url}/tree, as expected.
 2014-07-11 20:48:42 +01:00
Sylvain Corlay
70cacc642a Solving #5997: instances of WidgetView (that are not instances of DOMWidgetView) do not trigger widget_area.show anymore. 2014-07-11 12:55:56 -04:00
Thomas Kluyver
c37acf2ae7 Fix JS syntax 2014-07-11 11:07:42 -05:00
Thomas Kluyver
97c24d2920 Delete session rather than killing kernel in test cleanup 2014-07-10 23:54:32 -05:00
Thomas Kluyver
6efbe46b73 Update JS for kernels and sessions APIs 2014-07-10 23:54:31 -05:00
Thomas Kluyver
806432072a Add kernel name to sessions REST API 
Also, some refactoring so that the relationship between session, kernels
and notebooks is managed in the SessionManager, not in the HTTP
handlers.
 2014-07-10 23:50:00 -05:00
Thomas Kluyver
ae6309c122 Add support for different kernel specs to kernels REST API 2014-07-10 23:50:00 -05:00
Jonathan Frederic
904ed66bc2 Updated custom.js template to reflect IPython namespace changes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
a226bd2d6e Fixed cell toolbars 2014-07-10 15:47:23 -05:00
Jonathan Frederic
b15633a89e Fix all the tests 2014-07-10 15:47:23 -05:00
Jonathan Frederic
2478fac032 More requirejs fixes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
ee76005bc2 More review changes 2014-07-10 15:47:23 -05:00
Jonathan Frederic
669db572f2 Fix some dialog keyboard_manager problems 2014-07-10 15:47:23 -05:00
Jonathan Frederic
2d7a4a7879 Some JS test fixes 2014-07-10 15:47:23 -05:00
jon
70ffd96eb9 Added some nice comments, 
so devs can easily figure out what options to pass
into the objects they want to construct.
 2014-07-10 15:47:23 -05:00
jon
d9ab2d203a In person review with @ellisonbg 2014-07-10 15:47:23 -05:00
jon
1e098560b8 Revert "Google hangout review comments." 
This reverts commit 4e120e76014b2630f957c01d17ba3926d4848872.
 2014-07-10 15:47:22 -05:00
Jonathan Frederic
eb2b1ab4a4 Google hangout review comments. 2014-07-10 15:47:22 -05:00
Jonathan Frederic
c2c87e1a76 nbconvert api tests fixes 2014-07-10 15:47:22 -05:00
Jonathan Frederic
188072d190 @carreau review changes 2014-07-10 15:47:22 -05:00
Jonathan Frederic
2ba8945cab Fix all the bugs! 2014-07-10 15:47:22 -05:00
Jonathan Frederic
c7961ae2db Fix imports of "modules", 
required after converting everything into dictionary returns.
 2014-07-10 15:47:22 -05:00
Jonathan Frederic
0edfdbc703 Return dicts instead of classes, 
this makes require.js more Python import like.
 2014-07-10 15:47:22 -05:00
Jonathan Frederic
0e9e1dd5a3 MWE, 
Fixed LOTS of bugs
 2014-07-10 15:47:22 -05:00
Jonathan Frederic
0da779d101 Done with major changes, 
fixed widget IPython. references
 2014-07-10 15:47:22 -05:00
Jonathan Frederic
516958ac07 Almost done! 
Still need to check IPython uses in the widgets.
 2014-07-10 15:26:25 -05:00
Jonathan Frederic
ca2014ad06 Pager 2014-07-10 15:25:09 -05:00
Jonathan Frederic
152e23dc76 Progress... 2014-07-10 15:25:09 -05:00
Jonathan Frederic
e6b7cc9ff9 Fixed events 2014-07-10 15:25:09 -05:00
Jonathan Frederic
8d511b2ff5 Finished moving code into final(?) resting modules 2014-07-10 15:25:09 -05:00
Jonathan Frederic
9bfe5fc06c Use ipython namepsace for instances. 2014-07-10 15:25:09 -05:00
Jonathan Frederic
fb32b6561f Start of work to make notebook.html requirejs friendly. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
629204a2bb Fixed global IPython namespace. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
b1c8d2662c Finished making tree.html requirejs friendly 2014-07-10 15:25:08 -05:00
Jonathan Frederic
9f4a03ce79 Started work to make tree requirejs friendly. 2014-07-10 15:25:08 -05:00
Jonathan Frederic
855815d207 Make page.html require.js friendly. 2014-07-10 15:25:08 -05:00
Min RK
3e3be268f9 Merge pull request #5963 from jdfreder/viewids 
Allow widgets to display more than once within container widgets.
 2014-07-10 09:59:01 -05:00
MinRK
55f455ab55 only set allow_origin_pat if defined 
fixes the default behavior to be as intended (require Origin == Host)
 2014-07-09 16:25:36 -05:00
Thomas Kluyver
2bcbd3c5cb Check for pids when listing nbserver processes 2014-07-09 00:03:16 -05:00
Jonathan Frederic
1a30a12302 Ahhh bug fix! 2014-07-08 13:43:18 -05:00
Jonathan Frederic
df47869fb0 Move displayed event to view. 2014-07-08 11:58:14 -05:00
Jonathan Frederic
fa39d91446 Review comments 2014-07-08 11:24:24 -05:00
Jonathan Frederic
988fd1b5f9 Reverted strange change that I don't remember making to update method. 2014-07-08 10:57:57 -05:00
Jonathan Frederic
3a9d888f02 Removed respect_order and finally removed the children dict of the containerview 2014-07-08 10:57:57 -05:00
Jonathan Frederic
f51903ca03 Bug fixes 2014-07-08 10:57:56 -05:00
Jonathan Frederic
f1269d3de3 Add order respecting method 2014-07-08 10:57:56 -05:00
Jonathan Frederic
636362787b Fixed buggy behavior 2014-07-08 10:57:56 -05:00
Jonathan Frederic
14ff754cdf Allow a widget to be displayed more than once within a parent widget. 2014-07-08 10:57:56 -05:00
Min RK
7af9f5f1f8 Merge pull request #6061 from minrk/cors 
make CORS configurable
 2014-07-06 22:57:12 -05:00
MinRK
0d9ba93307 persist notebook server cookie secret in security dir 
prevents loss of login after relaunching the notebook server

closes #6075
 2014-07-06 22:21:59 -05:00
MinRK
1edc97e34a s/cors_/allow_/ 
add notes about Tornado 4, and comments, updates per review
 2014-06-30 10:40:31 -07:00
Jonathan Frederic
336a49eb18 Merge pull request #5995 from Carreau/clean-backward-compat 
remove backward compat `container` in output area as planed.
 2014-06-29 16:27:05 -07:00
Matthias BUSSONNIER
db5b58360e remove backward compat container in output area as planed. 2014-06-28 12:41:18 +02:00
MinRK
2460879e81 Remove a sleep no longer needed with the current base zmq version 2014-06-27 17:53:14 -07:00
MinRK
acf0da01d9 make CORS configurable 
allows setting CORS headers.

- cors_origin sets Access-Control-Allow-Origin directly
- cors_origin_pat allows setting Access-Control-Allow-Origin via regular expression, since the header spec itself doesn’t support complex access[1]
- cors_credentials sets Access-Control-Allow-Credentials: true

To allow CORS from everywhere:

    ipython notebook —NotebookApp.cors_origin='*'
 2014-06-27 17:47:56 -07:00
MinRK
78a8cb877f remove KernelApp.parent_appname 
This allowed the Kernel to load config from ipython_qtconsole_config.py
or ipython_notebook_config.py, depending on the parent that started the kernel.
This is of limited usefulness, and can add weird, unexpected side effects.
 2014-06-26 16:28:32 -07:00
Min RK
9f1dc1b99f Merge pull request #5803 from Carreau/ulh 
unify visual line handling
 2014-06-26 15:33:32 -07:00
Min RK
3fd6d371d7 Merge pull request #6015 from jcjaskula/dashboardExtensions 
Creating an entry point for notebook manager extensions
 2014-06-26 11:59:06 -07:00
Thomas Kluyver
85733cafa1 Merge pull request #6046 from minrk/raw-input-invalid 
fix stream output created by raw_input
 2014-06-25 18:13:05 -07:00
MinRK
ad4cb2c35a fix stream output created by raw_input 
was using incorrect 'name', when it should have been 'stream',
creating invalid content in notebook documents.
 2014-06-25 15:20:13 -07:00
MinRK
de0a7d7850 use utils.log.get_logger where appropriate 2014-06-24 20:16:46 -07:00
MinRK
e64f689374 don’t import IPython.parallel until it’s used 
in IPython.html.notebookapp
 2014-06-24 15:53:27 -07:00
Jean-Christophe Jaskula
9c2c680e8f Creating an entry point for notebook manager extensions 
- Firing app_initialized.DashboardApp event when loaded the notebook manager
- Updating tree.html template to load nbextensions through custom.js
 2014-06-24 15:03:29 -04:00
Min RK
c9961b44b6 Merge pull request #6000 from AlbertHilb/FloatWidgetValueFix 
Validate initial value of "_BoundedFloatWidget".
 2014-06-21 13:20:57 -05:00
Thomas Kluyver
3b92c7c24f Merge pull request #6011 from minrk/no-jsonapi 
only use zmq.jsonapi when talking to zmq sockets
 2014-06-18 14:45:31 -07:00
Min RK
99f52dee68 Merge pull request #5827 from takluyver/kernelspec-rest-api 
Kernel specs REST API
 2014-06-18 13:53:41 -07:00
MinRK
44d2a5b62a only use zmq.jsonapi when talking to zmq sockets 
use stdlib json otherwise
 2014-06-18 13:41:40 -07:00
Thomas Kluyver
ebf0ea32ef Use stdlib json, not zmq jsonapi 2014-06-18 12:51:41 -07:00
Steven Anton
f937045395 Set kernel_id before checking websocket 
If websocket attempt fails and cross origin attempt is detected, a HTTPError(404) error is raised. However, in the process of closing connections because of this 404 error, an unhandled Attribute exception (kernel_id not an attribute) is raised. Setting the kernel_id first avoids this.
 2014-06-17 12:29:55 -07:00
Raffaele De Feo
694f33e2ba Validate initial value of "_BoundedFloatWidget". 2014-06-17 15:02:28 +02:00
Thomas Kluyver
85ce34bc66 Kernel resource handlers now require authenticated user 2014-06-16 15:24:30 -07:00
Matthias BUSSONNIER
7128ff5148 add instruction to pin lessc 2014-06-13 21:56:39 +02:00
Matthias BUSSONNIER
fd4dd9246e inherit style instead of duplicating it 2014-06-13 21:56:39 +02:00
Thomas Kluyver
19f0362bb5 Add Xunit support for JS tests 
Casper supports producing xunit output. WIth this, our --xunit flag gets
passed down to the JS test process. This should give nicer output for
JS test failures on Jenkins.
 2014-06-11 09:30:27 -07:00
Jonathan Frederic
63f136af2b Fixed test to reflect new Bootstrap3 toggle button behavior. 2014-06-10 17:32:17 -07:00
Jonathan Frederic
22812d36b3 Use waits instead of sleeps. 2014-06-10 17:23:21 -07:00
Jonathan Frederic
5acb525c43 Wait for keyboard help fadein and fadeout. 2014-06-10 16:36:02 -07:00
Thomas Kluyver
d39cf0e927 Add jsonschema & jsonpointer requirements for JS tests 2014-06-10 12:38:46 -07:00
Thomas Kluyver
38d1f3dbc5 nbformat also requires jsonpointer 2014-06-10 12:37:45 -07:00
Thomas Kluyver
e0e91460c8 Require jsonschema for nbformat, html and nbconvert tests 2014-06-10 12:11:16 -07:00
Thomas Kluyver
37e4ef83b1 Move strip_ansi function to utils 2014-06-10 12:05:46 -07:00
Brian E. Granger
eab07229ef Merge pull request #5617 from jdfreder/bootstrap3 
Migrate from Bootstrap 2 to Bootstrap 3
 2014-06-10 10:51:50 -07:00
Jonathan Frederic
dba9a04f27 Removed block commented tour step (never worked anyways) 2014-06-10 10:50:34 -07:00
Jonathan Frederic
e31fa6cf2c Fix bootstrap tour 2014-06-10 10:14:14 -07:00
Jonathan Frederic
99b1747c60 Bootstrap Tour related fixes 2014-06-09 17:46:20 -07:00
Jonathan Frederic
bccb7ddaea Fab CSS 2014-06-09 16:14:07 -07:00
Jonathan Frederic
ea29056e7c Review #2 2014-06-09 16:13:59 -07:00
Thomas Kluyver
82e2ea7e47 Merge pull request #5323 from jdfreder/slimerjs 
Add support for Firefox JS testing
 2014-06-09 15:02:14 -07:00
Jonathan Frederic
63350a4d54 Fab CSS 2014-06-09 12:13:31 -07:00
Jonathan Frederic
1224af6028 Fixed cell toolbar select font size 2014-06-09 12:13:21 -07:00
Jonathan Frederic
cd289b6bdf Fab CSS 2014-06-09 12:06:29 -07:00
Jonathan Frederic
83eee97e95 Review comments 2014-06-09 12:05:40 -07:00
Jonathan Frederic
3bb8c472cd Modal fixes for BS3 2014-06-09 12:05:40 -07:00
Jonathan Frederic
4917aba5e4 Fab CSS 2014-06-09 12:05:40 -07:00
Jonathan Frederic
2d8afab3d4 Fix widget widths for Bootstrap3 2014-06-09 12:05:40 -07:00
Jonathan Frederic
33f7f4457f Widget bootstrap3 fixes 2014-06-09 12:05:39 -07:00
Jonathan Frederic
29de556b94 Fab CSS 2014-06-09 12:05:39 -07:00
Jonathan Frederic
8fd3515794 Post discussion with @ellisonbg 2014-06-09 12:05:39 -07:00
Jonathan Frederic
ceff3db0a2 Fab CSS 2014-06-09 12:05:39 -07:00
Jonathan Frederic
616bdcee81 Make maintoolbar select dropdowns look nice 2014-06-09 12:05:39 -07:00
Jonathan Frederic
32c7aea922 Fab CSS 2014-06-09 12:05:39 -07:00