Commit Graph

1281 Commits

Author SHA1 Message Date
mcelrath
5a070dcd1a Merge remote-tracking branch 'upstream/master' into mono_cursor_offset 2012-06-22 21:22:43 -07:00
Fernando Perez
50e4c5888b Merge pull request #2010 from bfroehle/webbrowser_missing
notebook: Print a warning (but do not abort) if no webbrowser can be found.

Closes gh-2006.
2012-06-22 17:51:34 -07:00
Bradley M. Froehle
7ae0c9482f notebook: Print a warning (but do not abort) if no webbrowser can be found.
Closes gh-2006.
2012-06-22 17:39:15 -07:00
Min RK
e306daad47 Merge pull request #1981 from tkf/kill-bg-processes
Clean BG processes created by %%script on kernel exit

* uses less forceful shutdown of kernels in the notebook, allowing atexit machinery to fire
* enables daemon BackgroundJobs
* cleanup %%script --bg subprocesses at shutdown
2012-06-20 13:35:56 -07:00
Min RK
87f3762e64 Merge pull request #1951 from minrk/nbdir
minor notebook startup/notebook-dir adjustments

* change inaccurate / distressing "Overwriting profile..." log message
* `ipython notebook path` results in setting notebook-dir if it's a dir,
  rather than unconditionally setting file-to-run
* file-to-run overrides no-browser
* kernels start in the notebook dir, rather than the Server's cwd
* notebook dir is validated, and created if it doesn't exist (only if parent exists, like ~all other such things)

closes #1985
closes #1980
2012-06-20 13:06:30 -07:00
Bussonnier Matthias
f200bd0392 Merge pull request #1974 from Carreau/notebook-path-completion
Allow path completion on notebook.
add slash (/) for unix,  backslash (\) and colon (:) for windows
as authorized characters in completions.
2012-06-19 23:42:32 -07:00
MinRK
d72d3f7e30 add tests for notebook_dir validation 2012-06-19 20:55:25 -07:00
Min RK
1c0c9d7b9f Merge pull request #1979 from msabramo/testing
Add basic support for tox (http://tox.testrun.org/) and Travis CI (http://travis-ci.org/)
2012-06-19 20:24:48 -07:00
Marc Abramowitz
324c052184 Add .tox to .gitignore 2012-06-19 08:13:37 -07:00
Takafumi Arakaki
af977fc15b Merge pull request #1 from minrk/kill-bg-processes
Use shutdown requests rather than hard kills in notebook
2012-06-18 18:16:29 -07:00
MinRK
61bbd632ef use shutdown_kernel instead of hard kill in notebook 2012-06-18 18:08:37 -07:00
MinRK
20f5c1b0cf enable graceful restart of kernels in notebook 2012-06-18 17:52:37 -07:00
MinRK
0fba6618cd create notebook-dir if it doesn't exist
closes #1980
2012-06-18 15:37:44 -07:00
Min RK
e97f84acd8 Merge pull request #1970 from minrk/resize
dblclick to restore resized images
2012-06-18 14:34:19 -07:00
Min RK
c797237e59 Merge pull request #1978 from kinverarity1/dot_truncation
Notebook names were truncating at the first period
2012-06-17 22:13:06 -07:00
Kent Inverarity
25ffbd89e0 change to minrk's suggestion from mailing list 2012-06-18 14:32:45 +09:30
Min RK
137f4cb441 Merge pull request #1825 from minrk/elide2
second attempt at scrolled long output

Some amount of CSS tweaking will probably want to be done before 0.13 final,
but this is good enough for beta.

closes #1553
2012-06-17 20:36:16 -07:00
Kent Inverarity
ef162c6d5c Fix nb name truncating at first period in filename 2012-06-18 10:35:16 +09:30
Fernando Perez
f52a1f689c Merge pull request #1934 from minrk/cellmd
Cell/Worksheet metadata

* metadata dicts are attached to cells and worksheets
* restores collapsed flag to the nbformat - this change happened in the refactor, and was undocumented, and possibly accidental.  But we should either document it or fix it, and this includes a fix.
* adds a new field, `nbformat_minor`, used to denote minor bumps of the notebook format that expose new capabilities but don't prevent loading by older clients.
* Add a warning in Javascript if loading a multiworksheet notebook (which will exist in the future) as current JS code will only save the first.


closes #1915
2012-06-17 17:21:35 -07:00
MinRK
18bb591723 add future-warning about multiple notebooks 2012-06-17 16:26:10 -07:00
Matthias BUSSONNIER
0161c55594 Allow path completion on notebook.
add -(dash) /(slash) \(antislash for windows) : (colon) ~(tilde)
as part of words symbol for notebook completer to help for path
completion

Fixes #1969
2012-06-17 13:37:55 +02:00
MinRK
9963980f37 use chained delay for setting resizable images 2012-06-16 21:20:04 -07:00
MinRK
e04fd13086 dblclick to restore size of images 2012-06-15 14:51:08 -07:00
Min RK
643837dff3 Merge pull request #1965 from ivanov/fix-1678
fix for #1678, undo no longer clears cells

With these changes, Ctrl-Z inside of codemirror cells will only undo up to the text that was in the cell when it was loaded from JSON.

closes #1678
2012-06-15 13:44:15 -07:00
Min RK
5a57dc5a1a Merge pull request #1952 from minrk/wsclose
avoid duplicate "Websockets closed" dialog on ws close
2012-06-15 01:54:04 -07:00
Paul Ivanov
ad07d0cf44 fix for #1678, undo no longer clears cells
I found another bug where switching the cell type causes the loss of all
undo history for that cell. With this commit, switching the cell type
simply resets the history
2012-06-14 17:36:34 -07:00
MinRK
c20b2e1056 slightly more subtle prompt overlay 2012-06-14 11:46:35 -07:00
MinRK
fa55ba2b43 fix margin typo on output prompt 2012-06-14 11:45:01 -07:00
MinRK
654fed95be avoid double websocket-close message 2012-06-13 14:52:39 -07:00
MinRK
272b954d7b use notebook-dir as cwd for kernels 2012-06-13 14:31:24 -07:00
MinRK
26a1cc7ee2 minor notebook-dir config adjustments
* `ipython Notebook /path/to/dir` sets notebook-dir to dir, not parent.
* add info message reporting notebook-dir
* file-to-run overrides no-browser
2012-06-13 13:48:56 -07:00
MinRK
afff38aabf Change distressing / inaccurate debug message about overwriting profiles 2012-06-13 13:47:43 -07:00
MinRK
224f024257 add dialog when loading newer minor-version notebooks 2012-06-13 02:27:23 -07:00
Fernando Perez
00ea424ed9 Merge pull request #1940 from Carreau/completer-css-patch
Fix completer css on some Chrome versions (was causing completer to be drawn at the wrong size).

Fixes #1833
2012-06-13 00:55:08 -07:00
Fernando Perez
b77baae951 Merge pull request #1938 from minrk/xreqxrep
Remove remaining references to deprecated XREP/XREQ names.

There was only one actual use of the deprecated constants in code, but numerous mentions in docstrings, etc.

These names have been removed from the next libzmq release, and will presumably be removed from pyzmq someday.
2012-06-13 00:53:08 -07:00
Matthias BUSSONNIER
623bb06c43 fix completer css on some Chrome versions
Fixes #1833
2012-06-13 09:50:36 +02:00
MinRK
58705f3a33 remove remaining references to deprecated XREP/XREQ names
only one line of actual code is changed.

these names have been removed from the next libzmq release,
and will presumably be removed from pyzmq someday.
2012-06-13 00:36:09 -07:00
Fernando Perez
ea6e18abf3 Merge pull request #1936 from minrk/savenotify
Increase duration of save messages and write permanent 'failed' message to the save status area on failed save.

Not a pop-up as described in #1461, but significantly more prominent, and most importantly permanent when saving fails, at least until the next successful save.

Closes #1461.
2012-06-13 00:22:58 -07:00
Fernando Perez
d81197455a Merge pull request #1849 from stefanv/octavemagic
Add %%octave, %octave, %octave_pull and %octave_push magics to facilitate interaction with Octave via oct2py.  This is similar in spirit to the R magic extension.
2012-06-12 23:52:57 -07:00
MinRK
ace8c72c9c increase duration of save messages
and write permanent 'failed' message to the save status area on failed save.
2012-06-12 20:36:29 -07:00
MinRK
ec50e94524 restore collapsed state for cells
js refactor removed this, but did not document the change.  This restores it, but it would be fine to revert this and update the docs instead.
2012-06-12 19:26:55 -07:00
MinRK
362feaa295 add empty metadata field on cells/worksheets
These are unused for now, but will allow adding data to the notebook without a full version bump.
2012-06-12 19:12:36 -07:00
Fernando Perez
b5e488d78c Merge pull request #1918 from minrk/nowarnquarantine
don't warn in iptest if deathrow/quarantine are missing, as they only exist in the dev source tree but are never installed.
2012-06-11 14:23:52 -07:00
MinRK
d73b4e428e don't warn in iptest if deathrow/quarantine are missing 2012-06-11 14:21:18 -07:00
Fernando Perez
b0357514ff Merge pull request #1911 from minrk/skipreload
Temporarily skip autoreload tests, as they were breaking Cython tests.

#1912 was created to track the issue that they need to be re-enabled, but isolated to their own group.
2012-06-11 12:44:38 -07:00
MinRK
33b0144b8f skip autoreload tests 2012-06-11 12:37:04 -07:00
mcelrath
160fbcdcbc Alternative solution: silently apply some CSS instead of a dialog box. 2012-06-11 09:53:31 -07:00
MinRK
15689fb664 add toggle output scroll to quickhelp 2012-06-10 21:28:20 -07:00
MinRK
ed4ee44a21 add ^M-O for toggling output scroll 2012-06-10 21:26:17 -07:00
MinRK
5f0b08145e dblclick/double click for humans 2012-06-10 20:00:10 -07:00