Commit Graph

2105 Commits

Author SHA1 Message Date
Matthias Bussonnier
8e211a1290 Merge pull request #3525 from minrk/utc
Fix basic timezone info

minor tweaks to jsonutil, to include timezone info if available
add IPython.utils.tz, which just has basic info for making utcnow(), etc. include tzinfo in the datetime object
use this tzinfo in the last_modified keys in notebook managers, which fixes Firefox's timezone offset for checkpoints
2013-07-05 07:35:27 -07:00
Matthias Bussonnier
903b424d16 Merge pull request #3532 from minrk/nbconvert_templates
include nbconvert templates in installation
2013-07-05 07:27:54 -07:00
Matthias Bussonnier
2052b1f1cf Merge pull request #3513 from minrk/nocp
add 'No Checkpoints' to Revert menu
2013-07-05 05:03:43 -07:00
MinRK
00cf5001c5 fix tplx extension in nbconvert latex templates 2013-07-04 09:50:42 -07:00
MinRK
09567f835b remove debug statement
and anchor
2013-07-04 08:58:43 -07:00
Matthias Bussonnier
9640b57161 Merge pull request #3528 from minrk/staticbase
fix local mathjax with custom base_project_url
2013-07-04 02:24:34 -07:00
Matthias Bussonnier
1bbbeddafd Merge pull request #3518 from takluyver/unused-imports
Clear up unused imports

Static analysis revealed a load of things that are imported but not used. I've tried to leave things that look like part of the API, and clear up other things.

Noticed a few test functions which had been copy-pasted without changing the name, in which case only the later one will run. I gave them separate names.
2013-07-04 02:24:15 -07:00
MinRK
af65f1177d include nbconvert templates in installation
fixes path spec in setupbase.py:find_package_data
2013-07-03 20:40:43 -07:00
MinRK
b20845172b fix local mathjax with custom base_project_url
closes #2720
2013-07-03 17:34:00 -07:00
MinRK
bc4a457fdc add timezone info to last_modified in notebook managers
now Firefox won't get confused, turning utc timestamps into local times.

closes #3396
2013-07-03 12:16:22 -07:00
Matthias Bussonnier
da8f8081b4 Merge pull request #3514 from minrk/ui-state-disabled
use bootstrap `disabled` instead of `ui-state-disabled`
2013-07-03 01:38:11 -07:00
Thomas Kluyver
679458f3b9 Fix test import 2013-07-02 23:03:29 +01:00
Thomas Kluyver
1b66bd9615 Remove unused imports in IPython.testing 2013-07-02 23:00:28 +01:00
Thomas Kluyver
a2bf752dba Remove unused imports in IPython.html 2013-07-02 22:31:40 +01:00
MinRK
d12a9b19c9 use bootstrap disabled instead of ui-state-disabled
in menubar
2013-07-02 10:42:12 -07:00
MinRK
40b882906f add 'No Checkpoints' to Revert menu
when there are None, rather than an empty menu.

closes #3261
2013-07-02 10:38:05 -07:00
Min RK
7084556f19 Merge pull request #3510 from minrk/ffisbroken
use `window.onbeforeunload=` for nav-away warning

Firefox 22 broke `$(window).on("beforeunload")` somehow, for some reason, resulting in always showing a dialog, regardless of the function's return value.

closes #3509

The only fix I could find was resorting to the basic low-level API.
2013-07-02 09:51:51 -07:00
MinRK
b9706f23f5 use window.onbeforeunload= for nav-away warning
Firefox 22 broke `$(window).on("beforeunload")` somehow, for some reason,
resulting in always showing a dialog, regardless of the function's return value.

The only fix I could find was resorting to the basic low-level API.
2013-07-01 21:49:39 -07:00
Min RK
5fda0b9c52 Merge pull request #3504 from minrk/fixsession
don't use parent=self in handlers

handlers aren't configurable, so shouldn't be passed as parent.

closes #3502
2013-07-01 11:11:22 -07:00
MinRK
88668e65f8 don't use parent=self in handlers
handlers aren't configurable, so shouldn't be passed as parent.

closes #3502
2013-07-01 10:55:48 -07:00
Brian E. Granger
13c93844ed Merge pull request #3500 from ipython/nbconvert
Merge nbconvert into IPython
2013-07-01 10:33:20 -07:00
Brian E. Granger
202dec41e6 Merge pull request #3478 from minrk/rewarn
restore "unsaved changes" warning on unload
2013-06-30 21:52:19 -07:00
Brian E. Granger
b3dc666ac9 Merge pull request #3493 from minrk/restart-dialog
add a dialog when the kernel is auto-restarted
2013-06-30 21:50:09 -07:00
Brian E. Granger
70f726517a Merge pull request #3488 from takluyver/test_autoreload
Add test suite for autoreload extension
2013-06-30 21:42:40 -07:00
Brian E. Granger
c323717fe7 Merge pull request #3430 from minrk/configinstance
add parent to Configurable
2013-06-30 21:27:46 -07:00
Brian E. Granger
7d7912d732 Fixing test logic for nbconvert to get tests to pass. 2013-06-30 20:59:21 -07:00
Brian E. Granger
1c478745fa Fixing imports in setupbase.py. 2013-06-30 20:59:12 -07:00
Brian E. Granger
072a94370d Fixing install logic for nbconvert. 2013-06-30 18:05:02 -07:00
Brian E. Granger
390717c53a Fixing import for nbconvert. 2013-06-30 18:04:56 -07:00
MinRK
c7355b8ba7 move nbconvert into place as subpackage 2013-06-30 18:03:29 -07:00
MinRK
9fca75762f merge nbconvert 2013-06-30 18:02:21 -07:00
MinRK
1d64597ea8 move restart dialog to notebook.js 2013-06-29 15:48:14 -07:00
MinRK
d8fa8eea04 add a dialog when the kernel is auto-restarted
adds the autorestart status event for the dialog

so that user-restart is distinct from server-side auto restart.

closes #3490
2013-06-29 15:35:39 -07:00
Min RK
a06509f8e1 Merge pull request #3491 from takluyver/notebook-kernel-died
Remove unexpected keyword parameter to remove_kernel

now is a relic from before cleaning up the kernel manager / restart logic

closes #3474
2013-06-29 15:16:46 -07:00
Thomas Kluyver
acb7eefef8 Remove unexpected keyword parameter to remove_kernel
Closes gh-3474
2013-06-29 23:01:34 +01:00
Thomas Kluyver
e4a08d1036 Add test suite for autoreload extension
Closes gh-1912
2013-06-29 22:29:51 +01:00
MinRK
bd03a99e28 use parent=self throughout IPython
instead of `config=self.config`

only real effective change: IPythonKernelApp.parent has been renamed to IPKernelApp.parent_handle.
2013-06-29 12:41:17 -07:00
Paul Ivanov
458d84bd58 Merge pull request #3482 from vitaut/master
Use an absolute path to iptest, closes #3480
2013-06-29 10:14:27 -07:00
Victor Zverovich
99eedefa41 Use absolute path to iptest, because the tests are not always run from $IPYTHONDIR. 2013-06-29 07:36:28 -07:00
Paul Ivanov
0c11e07148 Merge pull request #3381 from minrk/retina
enable 2x (retina) display
2013-06-28 16:02:52 -07:00
MinRK
a51f9e1a6e update before unload message
mention pending autosave, if applicable
2013-06-28 15:40:40 -07:00
MinRK
09c7bba2b4 restore "unsaved changes" warning on unload
Autosave is triggered at this event, but it seems to fail sometimes (perhaps when it's too slow?).

closes #3475
2013-06-28 15:40:40 -07:00
Fernando Perez
90e2f601b8 Merge pull request #3450 from ipython/flatten
Flatten IPython.frontend, moving all its components to the top-level of IPython.

This includes a shim module that allows older projects to maintain backwards compatibility while warning them loudly about the change, so they can adapt to the new API.
2013-06-28 13:10:40 -07:00
MinRK
a3653e34b1 update references for IPython.html 2013-06-27 11:14:10 -07:00
MinRK
cf726d6a40 mv IPython.html.notebook -> IPython.html 2013-06-27 11:14:10 -07:00
MinRK
eaffc26e9c update frontend in MANIFEST and .gitignore 2013-06-27 11:14:09 -07:00
MinRK
7f255c9d26 remove a few dangling frontends from setupbase 2013-06-27 11:14:09 -07:00
Fernando Perez
a1c0b749ff Fix imports in test suite. 2013-06-27 11:14:08 -07:00
Fernando Perez
f150b6f6a9 Fix all remaining imports that used IPython.frontend. 2013-06-27 11:14:07 -07:00
Fernando Perez
9858a93794 Fix all imports for the notebook. 2013-06-27 11:14:07 -07:00