mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,812 Commits 20 Branches 1,036 Tags 78 MiB
16d21d3267
Commit Graph

2146 Commits

Author SHA1 Message Date
Matthias Bussonnier
16d21d3267 Merge pull request #6188 from jasongrout/highlightjs-require-shim 
Add a requirejs shim for highlight.js
 2014-07-24 13:53:28 +02:00
Matthias Bussonnier
b290f48815 Merge pull request #6036 from minrk/restore-ws-host 
restore websocket_url configurable
 2014-07-24 13:41:18 +02:00
Thomas Kluyver
d9850e1ab4 Merge pull request #6144 from minrk/show-js-errors 
add some debugging output to js tests
 2014-07-23 16:20:01 -07:00
MinRK
41e482d47a fix interrupt test revealed by new output 
the shortcut test wasn’t running at all,
due to a ReferenceError.

There was no indication of this fact
because javascript is awesome like that.
 2014-07-23 15:51:03 -07:00
MinRK
1f0646f893 add some debugging output to js tests 
- display errors in evaluate / browser code
- capture and display console.log if a test fails (like nose)
 2014-07-23 15:51:03 -07:00
Brian E. Granger
29d67ed8a3 Merge pull request #6168 from SylvainCorlay/once-displayed 
once-displayed
 2014-07-23 14:17:38 -07:00
Jason Grout
3fc4442053 Move shim to the standard location 2014-07-23 21:13:42 +00:00
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
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
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