Commit Graph

1414 Commits

Author SHA1 Message Date
Cameron Bates
6de923fb95 Rename "nb" variable to "template" for clarity 2012-12-10 21:41:17 -08:00
Cameron Bates
7493794594 Move environment setting from handler to the notebook application 2012-12-06 13:35:28 -08:00
Cameron Bates
3d08384741 Make template environment a property and fix notebook location 2012-11-24 09:11:03 -05:00
Cameron Bates
7b3c01c667 Merge upstream changes 2012-11-22 21:27:50 -05:00
Bussonnier Matthias
01a54bee69 Merge pull request #2572 from dwf/paste_above_as_default
Make 'Paste Below' the default paste behavior in notebook.
2012-11-22 11:12:39 -08:00
David Warde-Farley
e3255ce471 Merge pull request #1 from Carreau/pr2572
paste below by default
2012-11-22 10:22:04 -08:00
Matthias BUSSONNIER
a56ee187ff past below by default 2012-11-18 12:30:36 +01:00
Bussonnier Matthias
c0390645f2 Merge pull request #2574 from dkua/Fix#2244
Reformatted the warning message of notebook server starting.

Public IP without SSL should prompt a warning.
Public IP in read-write mode and no password, also a warning.

Fix #2244
2012-11-17 09:02:02 -08:00
dkua
5993c3bf9f Made changes as per discussion in PR thread. 2012-11-13 18:06:15 -05:00
dkua
da8c05414e Made some changes to message and logic as advised by Fernando. 2012-11-13 17:11:03 -05:00
dkua
c8d3dbcc98 Refactored warning printout as per Issue #2244 2012-11-13 17:11:03 -05:00
David Warde-Farley
a9910aa408 "Paste Cell Replace" -> "Paste Cell & Replace" 2012-11-12 17:47:43 -05:00
David Warde-Farley
01f0332add Make 'Paste Above' the default paste behavior.
Destructive paste mapped to Ctrl-M V is a surprising choice given that
there was no drag-to-select on the area being replaced (there is a
weaker notion of "selected cell" but this does not map to will-be-replaced-
by-paste in the minds of participants in an unscientific poll at
PyConCA).

Destructive paste is still available as the last paste option in the
Edit menu, qualified as "Paste Cell Replace".
2012-11-12 17:22:44 -05:00
Bussonnier Matthias
a0544ec066 Merge pull request #2561 from takluyver/notebook-carriage-return
Fix display of plain text containing multiple carriage returns before line feed
2012-11-12 02:14:30 -08:00
Bussonnier Matthias
1f79f5b89e Merge pull request #2549 from dwf/delete_undo
Add a simple 'undo' for cell deletion.
2012-11-12 02:13:57 -08:00
Bussonnier Matthias
56f1f39fbe Merge pull request #2525 from Carreau/execute_hooks
Add event to kernel execution/shell reply.
2012-11-09 06:08:18 -08:00
Thomas Kluyver
015e8e73f4 Fix display of plain text containing multiple carriage returns before line feed.
Closes gh-2560
2012-11-08 23:33:15 +00:00
David Warde-Farley
8ecb8cd8fe Make undelete respect order after insertions/deletions. 2012-11-06 17:56:14 -05:00
David Warde-Farley
bb8249864d Add comment re: quickhelp key. 2012-11-06 03:21:16 -05:00
David Warde-Farley
f4d471c70e Move undo quickhelp to more appropriate spot. 2012-11-05 19:01:24 -05:00
David Warde-Farley
33c1f78d33 Add a simple 'undo' for cell deletion.
I've accidentally deleted the wrong cell quite a few times and
it has been quite frustrating. This enables a very hacky backup of
the last cell deletion.

I'm sure the core devs will have some opinions on both the feature
and its implementation, I consider this very much a first pass.
2012-11-05 18:58:09 -05:00
Matthias BUSSONNIER
4aea2b495a add status_started event to Kernel 2012-11-05 19:51:31 +01:00
Matthias BUSSONNIER
68fd917bfb change all trigger parameter to (event,data) 2012-11-02 21:23:34 +01:00
Matthias BUSSONNIER
afa18913b9 invert event name 2012-11-02 13:58:08 +01:00
Fernando Perez
3254572a90 Merge pull request #2517 from ahmadia/mathjax_fix2
Addresses the javascript errors resulting in a blank notebook pointed out in #2349 as well as significant performance degradations that were introduced by that merge.

It also disables equation numbering/references, fixes broken offline access and re-typesets individual Notebook Cells instead of the entire document on edit.

Closes #2289.
2012-11-01 21:51:56 -07:00
Aron Ahmadia
cf0254bc31 Finalizing fixes to MathJax enhancements
* Cell.prototype.typeset functionality restored
* MathJax configuration files back in .js, delayedStartup
* Renamed HUB to hub
* Removed vestigial comment
* Restored Markdown Cell placeholder render functionality
2012-11-01 09:11:13 +00:00
Aron Ahmadia
5863b6fd7f undid unique ids, used jQuery 2012-11-01 08:22:19 +00:00
Aron Ahmadia
4620ce8348 Remove Equation References/Numbering, Fix Bugs
Equation References and Numbering are not going to be trivial to add,
so the code has been removed for now.  Important fixes include
no-MathJax support (previously, the code was failing), and the
generation of unique ids for the rendering content in each cell,
tremendously speeding up MathJax rendering.

I am still not rendering placeholder text.
2012-11-01 08:22:19 +00:00
Aron Ahmadia
12c661f761 Improved MathJax, missing callback workaround
MathJax.InputJax.TeX.resetEquationNumbers is supposed to be available,
but isn't consistently loaded before the notebook fires off its first
re-render request.  The code edits in mathjaxutils.js fix this issue.

Additionally, there was some init code in mathjaxutils.js that has been
properly excised to the html templates.

Removed some orphan rendering code so that all typesetting now goes
through mathjaxutils.js

Finally, removed an extra cell in the demo notebook.
2012-11-01 08:22:19 +00:00
Bussonnier Matthias
eba9044f2e Merge pull request #2464 from iguananaut/nb-out-links
Locate URLs in notebook text output and convert them to hyperlinks.
2012-10-31 08:52:51 -07:00
Bussonnier Matthias
fcad4a3f2c Merge pull request #2498 from Carreau/fixes2487
Don't catch tab press when something selected

allow to indent with 'tab' in some cases.
2012-10-31 01:40:23 -07:00
Bussonnier Matthias
095d8c85d0 Merge pull request #2527 from ivanov/run-fine-grained
Notebook, add Run All Above and Run All Below action in Menu
2012-10-31 01:32:11 -07:00
Paul Ivanov
b96b4689ed added on-hover descriptions of the new menu items 2012-10-26 15:29:19 -07:00
Paul Ivanov
2949cd5787 fine-grained notebook 'run' controls, closes #2521
This adds "Run All Above" and "Run All Below" menu items to Cell thanks
to @Carreau for the implementation suggestion
2012-10-26 15:21:04 -07:00
Matthias BUSSONNIER
eeea623161 Add event to kernel execution/shell reply.
This should allow to hook more easily phantomjs for testing.
2012-10-26 22:03:57 +02:00
Paul Ivanov
7701373695 Merge pull request #2519 from ivanov/clear-input-prompt-on-clear-all-output
clear In[ ] prompt numbers again
2012-10-26 00:59:39 -07:00
Paul Ivanov
0b3cb7764d clear In[ ] prompt numbers again 2012-10-25 19:54:56 -07:00
Brian E. Granger
82dae6715b Merge pull request #2349 from ahmadia/mathjax_fix
ENH: added StackExchange-style MathJax filtering
2012-10-20 13:44:40 -07:00
Matthias BUSSONNIER
c1a11bbb3b Don't catch tab press when something selected
fixes #2487
2012-10-17 18:45:48 +02:00
Min RK
a84955b4a8 Merge pull request #2492 from minrk/pygments_setup
add missing 'qtconsole' extras_require

The docs mention `easy_install ipython[qtconsole]`, but that would fail because it was undefined.  It now implies the pygments extra dependency described in the docs.
2012-10-15 10:05:55 -07:00
MinRK
660ea94d73 add missing 'qtconsole' extras_require
The docs mention `easy_install ipython[qtconsole]`, but that would fail. The alternative would be to change the docs, but then we would have no expression of the pygments optional dependency.

should be back ported to 0.13.1
2012-10-14 14:09:27 -07:00
Aron Ahmadia
8d3fbe5901 Refactored to JS standards. Fixed Attribution.
thisStyle      --> this_style.
function foo() --> var foo = function()

StackExchange improperly attributed for Davide Cervone's
Markdown+MathJax handling.  This has been fixed.

Ref:
http://stackoverflow.com/a/11231030/122022
http://www.math.union.edu/~dpvc/transfer/mathjax/mathjax-editing.js
2012-10-13 14:29:17 +03:00
Aron Ahmadia
2ec0115f77 added math typesetting example notebook 2012-10-13 14:10:22 +03:00
Aron Ahmadia
346173bcad correct environment rendering 2012-10-13 14:10:21 +03:00
Aron Ahmadia
0caac8cd28 partial refactor, can't quite get environments working 2012-10-13 14:10:21 +03:00
Brian E. Granger
bcdec179f8 Merge pull request #2474 from Carreau/bootstrap_name_conflict
fix bootstrap name conflicts
2012-10-10 20:55:45 -07:00
Matthias BUSSONNIER
aa9a5db301 fix bootstrap name conflicts
change .tooltip to .ipython_tooltip
class name in css to avoid conflic with bootstrap

don't put header logo in h1 to also avoid conflict
2012-10-07 18:57:01 +02:00
Min RK
a9dbe36baa Merge pull request #2468 from bfroehle/pycache
Tell git to ignore __pycache__ directories.
2012-10-04 13:54:06 -07:00
Bradley M. Froehle
e3ae952054 Tell git to ignore __pycache__ directories. 2012-10-04 12:19:18 -07:00
Erik M. Bray
ae27cc7c3e Locate URLs in text output and convert them to hyperlinks. 2012-10-03 16:51:18 -04:00