mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-05 12:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,846 Commits 22 Branches 1,049 Tags 79 MiB
925a968840
Commit Graph

4846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Bussonnier
925a968840 Merge pull request #6063 from Carreau/fix-5984 
Introduce info/warning/danger to notification area
 2014-07-26 16:32:59 +02:00
Thomas Kluyver
fcb079a255 Merge pull request #6210 from jdfreder/image-test-fix 
Don't screenshot in the ImageWidget test,
 2014-07-25 16:33:16 -07:00
Brian E. Granger
2999510bfa Merge pull request #6182 from SylvainCorlay/do-diff-correction 
do_diff function was always removing all views from the old list.
 2014-07-25 12:09:58 -07:00
Brian E. Granger
1224e1e5a4 Merge pull request #6204 from minrk/xs-cluster-columns 
move some responsive bootstrap transitions
 2014-07-25 11:48:03 -07:00
Jonathan Frederic
ee64b60e69 Don't screenshot in the ImageWidget test, 
instead verify that the base64 makes it to the page and
assume that the browser knows how render it correctly.
 2014-07-25 11:21:52 -07:00
Matthias BUSSONNIER
573c45613d fix missing semicolons 2014-07-25 10:14:28 +02:00
Jonathan Frederic
79e7619acb Merge pull request #6208 from bavardage/master 
add marked to require dependencies
 2014-07-24 23:50:19 -07:00
Ben Duffield
aa8df62b81 add marked to require dependencies 2014-07-24 23:05:01 -07:00
Thomas Kluyver
a5b145e5a2 Merge pull request #6139 from minrk/wsping 
send ping every 30 seconds to keep websockets alive
 2014-07-24 18:55:18 -07:00
Paul Ivanov
8becf64d7e Merge pull request #6206 from minrk/git-hooks 
minor tweak to git hooks
 2014-07-24 15:09:37 -07:00
Matthias BUSSONNIER
93314f8126 Introduce info/warning/danger to notification area 
Add corresponding style.

Should fix #5984

Error when (auto)saving and things along should stand out in the
UI for the user to investigate the reason as soon as possible not to
loose work later.
 2014-07-25 00:09:23 +02:00
MinRK
7372aa8110 minor tweak to git hooks 
- fix PREVIOUS_HEAD when run as git-merge
- catch fab css failure
 2014-07-24 14:45:12 -07:00
MinRK
11193d4790 move some responsive bootstrap transitions 
- `-md-` puts the transition at 970px
- `-sm-` puts the transition at 768px

I moved most of the `md` transitions to `sm`,
which seems more reasonable.
I also moved the cluster list to `xs` because
the columns will never be wider than a dozen or so characters.
 2014-07-24 13:02:30 -07:00
Paul Ivanov
b67aac5aef Merge pull request #6119 from minrk/global-events 
return global events from require(['base/js/events']).
 2014-07-24 12:23:14 -07:00
Min RK
43e25ab4d9 Merge pull request #6196 from minrk/git-friendlyish-less-css 
Make less/sourcemaps a bit friendlier to git
 2014-07-24 12:09:54 -07:00
MinRK
6a1cdc6825 post-merge is just a symlink to post-checkout 2014-07-24 11:44:02 -07:00
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
MinRK
ff98a86f2d check_call with list, instead of shell=True 2014-07-23 17:03:14 -07:00
MinRK
168d619726 fab css checks whether it needs to do anything 
makefile-style

adds `force` arg to override, minify implies force.
 2014-07-23 16:59:44 -07:00
MinRK
b1882ca9e5 add strict arg to css_js setup decorator 
and attempt to build css on build_by (install)
 2014-07-23 16:59:43 -07: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
52840fcbf8 send ping every 30 seconds to keep websockets alive 2014-07-23 16:17:07 -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
MinRK
01e1d1d40f regen css (non-minified) 
via `setup.py css`
 2014-07-23 14:57:17 -07:00
MinRK
0c1074223b attempt to regen source maps in git-hooks 
if css changes
 2014-07-23 14:55:58 -07:00
MinRK
6ea0bd4e94 remove css sourcemaps from repo 2014-07-23 14:53:32 -07:00
MinRK
0eae787b58 don’t store minified css in development 
- setup css defaults to non-minified css
- build minified css and jsversion on sdist/wheel
 2014-07-23 14:19:27 -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
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
Thomas Kluyver
e0dbb7f187 Merge pull request #6069 from minrk/coalesce_streams 
coalesce stream output in the notebook
 2014-07-22 15:51:43 -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