Jonathan Frederic
1573624d5f
Merge pull request #7818 from ipython/revert-7721-widecontents2
...
Revert "Prevent image outputs from being wider than their container."
2015-02-20 11:13:33 -08:00
Thomas Kluyver
6272522a5a
Revert "Prevent image outputs from being wider than their container."
2015-02-19 11:11:06 -08:00
Jonathan Frederic
d423b11dd4
Merge pull request #7801 from jasongrout/display-state-change
...
Force display_message to be processed in order
2015-02-19 09:35:30 -08:00
Kyle Kelley
720e0d1ef7
Merge pull request #7811 from abalkin/patch-2
...
Update actions.js
2015-02-17 20:06:00 -08:00
Kyle Kelley
053724510b
Merge pull request #7810 from abalkin/patch-3
...
Update actions.js
2015-02-17 19:58:37 -08:00
abalkin
3a6c634f3e
Update actions.js
...
Added help for select- actions.
2015-02-17 22:08:34 -05:00
abalkin
6e5ef91f5a
Update actions.js
...
Clarified "delete-cell" action.
2015-02-17 21:44:31 -05:00
Matthias Bussonnier
9faf6cbec1
Merge pull request #7809 from abalkin/patch-2
...
Update actions.js
2015-02-17 18:29:28 -08:00
abalkin
25a1d9e2f6
Update actions.js
...
See issue #7807 .
2015-02-17 21:13:37 -05:00
Thomas Kluyver
818579c750
Merge pull request #7808 from abalkin/patch-1
...
Update quickhelp.js
2015-02-17 18:00:30 -08:00
abalkin
64de4432a6
Update quickhelp.js
2015-02-17 20:53:29 -05:00
abalkin
66f6818e42
Update quickhelp.js
2015-02-17 20:50:36 -05:00
abalkin
433dea8215
Update quickhelp.js
...
Use left/right instead of before/after.
2015-02-17 20:06:06 -05:00
Thomas Kluyver
f337c28b50
Merge pull request #7806 from takluyver/ctrl-jk-rm-doc
...
Remove mention of Ctrl-J & Ctrl-K shortcuts from example notebook
2015-02-17 15:36:45 -08:00
Thomas Kluyver
1b18a61c89
Remove mention of Ctrl-J & Ctrl-K shortcuts from example notebook
2015-02-17 15:15:18 -08:00
Jason Grout
0b2f212786
Force display_message to be processed in order
...
Otherwise sometimes the display message will be processed before the update message.
2015-02-16 21:22:52 +00:00
Min RK
10dcd71550
back to dev
2015-02-13 14:00:58 -08:00
Min RK
c597f97b82
release 3.0.0rc1
2015-02-13 13:59:12 -08:00
Min RK
69fe3a6d64
Merge pull request #7768 from minrk/handle-close
...
handle zmq messages that may be processed after websocket is closed
2015-02-13 10:25:36 -08:00
Min RK
60bff3735b
rebuild css
2015-02-12 19:48:52 -08:00
Min RK
2fdc2cd096
Merge pull request #7740 from dongweiming/radio
...
fix Radio margin
2015-02-12 19:28:14 -08:00
dongweiming
bf3b9dc0c6
fix Radio margin
2015-02-13 09:46:25 +08:00
Thomas Kluyver
faf648d259
Merge pull request #7756 from Carreau/common_conf
...
pass common config to contents manager
2015-02-12 16:32:03 -08:00
Min RK
07e5f78ef2
handle message arriving when sockets are closed
...
check both the incoming and outgoing streams
before proceeding to send messages
2015-02-12 16:21:36 -08:00
Min RK
b34d9eb76a
backport WebSocket.send_error from tornado 4.1
...
raising an exception in a websocket results in
"Method not supported" on tornado 4.0
2015-02-12 16:20:50 -08:00
Matthias Bussonnier
8567deaa6f
Pass common_config to content manager.
2015-02-12 16:11:13 -08:00
Thomas Kluyver
c5bed40d72
Merge pull request #7766 from minrk/select-pad
...
adjust appearance of cell toolbar select
2015-02-12 14:41:04 -08:00
Min RK
0ea61c7500
Merge pull request #7747 from Carreau/fix-lang
...
Select language based on old notebook meta.lang.
2015-02-12 13:43:38 -08:00
Matthias Bussonnier
1ea96d24c4
typo "Should"
2015-02-12 12:12:51 -08:00
Matthias Bussonnier
7a9797f6f6
Typo "settings"
2015-02-12 12:12:21 -08:00
Min RK
600a61b993
Merge pull request #7763 from ctaf42/cg/utils/get_body_data
...
get_body_data: fix for undefined
2015-02-12 12:00:48 -08:00
Min RK
124874f115
Merge pull request #7610 from Carreau/_blank
...
make some target _blank configurable
2015-02-12 11:59:34 -08:00
Min RK
f4513bc7ce
adjust appearance of cell toolbar select
...
undo some of the bootstrap mixin sizing,
which should help the appearance on Firefox on Linux.
2015-02-12 11:53:14 -08:00
Matthias Bussonnier
4bca402eae
Merge pull request #7748 from minrk/poll-windows
...
add no-op every 5s on Windows
2015-02-12 11:17:29 -08:00
Matthias Bussonnier
9cc7c2bf02
Merge pull request #7730 from minrk/complete-v4-empty
...
handle zero-length match in v4 completions
2015-02-12 11:14:33 -08:00
Jonathan Frederic
412ac27120
Merge pull request #7721 from jdfreder/widecontents2
...
Prevent image outputs from being wider than their container.
2015-02-12 09:42:40 -08:00
Cedric GESTES
49845b92af
get_body_data: fix for undefined
...
return undefined instead of "undefined"
2015-02-12 14:26:49 +01:00
Fernando Perez
74ca347028
Merge pull request #7754 from minrk/screenKeys
...
disable screenKeys in term.js (enables things like `Ctrl-a` to work as expected in the terminal)
2015-02-11 14:46:01 -08:00
Min RK
8b93d1561e
disable screenKeys in term.js
...
these capture ctrl-a and other keyboard shortcuts
2015-02-11 14:10:12 -08:00
Thomas Kluyver
8983606a89
Merge pull request #7752 from Carreau/nbdoc
...
minor doc improvement on nbextension
2015-02-11 12:57:08 -08:00
Matthias Bussonnier
cfa2d26f71
minor doc improvement on nbextension
2015-02-11 12:52:42 -08:00
Matthias Bussonnier
2394be85c2
explicitely pass language for old notebook
2015-02-11 12:07:46 -08:00
Min RK
64b4d90eeb
add no-op every 5s on Windows
...
signals don't interrupt the inner loop on Windows,
so pump the eventloop every 5s
2015-02-11 10:45:26 -08:00
Jonathan Frederic
65540779ee
Merge pull request #7733 from minrk/esc-tooltip
...
prevent esc from bubbling up when dismissing tooltip
2015-02-11 10:20:00 -08:00
Matthias Bussonnier
62bfd92374
Select language based on old notebook meta.lang.
...
Also fix UI when selecting kernels by string.
Fix #7744 and #7742
2015-02-11 10:15:07 -08:00
Thomas Kluyver
1a5283dee9
Merge pull request #7734 from minrk/inner-cell-ff
...
scrolling workaround for Firefox
2015-02-10 17:52:50 -08:00
Min RK
7bbdabdfd5
scrolling workaround for Firefox
...
setting overflow-x: hidden on Firefox prevents
long input from growing the cell ever wider on Firefox.
CSS is only applied on Firefox
2015-02-10 17:32:47 -08:00
Min RK
4ec038db1b
Merge pull request #7720 from jdfreder/readonlyui
...
Readonly indicator.
2015-02-10 17:15:06 -08:00
Min RK
8e20f8d848
prevent esc from bubbling up when dismissing tooltip
...
prevents esc from entering command mode when it's
meant to dismiss the tooltip.
The logic for the event was already there,
it just lacked the `ipkmIgnore` bit.
2015-02-10 17:09:40 -08:00
Thomas Kluyver
73727ed5ae
Remove Ctrl-J & Ctrl-K shortcuts
...
Closes gh-7716
2015-02-10 13:36:20 -08:00