Commit Graph

1950 Commits

Author SHA1 Message Date
Matthias Bussonnier
6d4e7d2fde Merge pull request #3267 from minrk/forreals
add missing return
2013-05-02 23:47:22 -07:00
MinRK
7782dfcb4e add missing return
closes #3260 (again)
2013-05-02 23:43:58 -07:00
Brian E. Granger
d3da03069d Merge pull request #3101 from minrk/marked
use marked / highlight.js instead of pagedown and prettify
2013-05-02 15:49:50 -07:00
MinRK
8df01f22aa finish removing prettify 2013-05-02 15:26:30 -07:00
MinRK
796fb5d0a8 unify highlight.js / codemirror style 2013-05-02 12:24:37 -07:00
MinRK
6ac2bdf086 use highlight.js to highlight markdown code blocks 2013-05-02 12:24:36 -07:00
MinRK
b6c390db06 use marked for markdown 2013-05-02 12:24:26 -07:00
Brian E. Granger
32c0f7abf9 Merge pull request #3263 from minrk/nocp
fix set_last_checkpoint when no checkpoint
2013-05-02 10:01:47 -07:00
MinRK
70dd6e1612 fix set_last_checkpoint when no checkpoint
closes #3260
2013-05-02 08:58:59 -07:00
Min RK
c7e0f2acd6 Merge pull request #3258 from takluyver/i3257
Fix submodule location in setup.py
2013-05-02 08:55:38 -07:00
Thomas Kluyver
405e434d45 Fix for checking submodules location
Closes gh-3257
2013-05-02 13:47:18 +01:00
Brian E. Granger
3d07b3ddfb Merge pull request #3254 from minrk/fixurls
fix a few URLs from previous PR
2013-05-01 21:34:05 -07:00
MinRK
e1f4d0a85f fix a few URLs from previous PR
some of the URLs in the submodules PR were not updated
2013-05-01 21:30:27 -07:00
Brian E. Granger
4a654d1c29 Merge pull request #3240 from minrk/submodules
remove js components from the repo
2013-05-01 21:10:30 -07:00
MinRK
2cf93510f8 use less from components 2013-05-01 18:24:23 -07:00
MinRK
317debce06 remove unused components
remove command from fabfile

components live in a submodule
2013-05-01 18:19:36 -07:00
Fernando Perez
10062c346f Merge pull request #3158 from minrk/autosave
Add autosaving to the notebook, while retaining manual checkpoint creation.

Autosave will perodically save the notebook, with a default interval of two minutes. This interval is configurable, and the system will automatically back off the frequency if it detects that the save operation takes too long. This can be the case if working remotely over a slow link, so this will automatically conserve bandwidth.

The manual save operation remains available and bound to the same keys, but now it causes the creation of a separate checkpoint, which is stored in a hidden directory called `.ipynb_checkpoints`.  This provides users a poor-man's version control with a single revert point and the ability to safely experiment with potentially destructive changes to a notebook without concern that the autosave operation may clobber their file on disk.

See [IPEP 15](https://github.com/ipython/ipython/wiki/IPEP-15%3A-Autosaving-the-IPython-Notebook) for details of the proposal.
2013-05-01 18:05:40 -07:00
MinRK
8b5e5a5e09 restore checkpoints in a sub-list
minor styling update to the restore dialog as well
2013-05-01 17:34:23 -07:00
MinRK
c1b19755fd rename shouldn't create a checkpoint 2013-05-01 17:32:47 -07:00
MinRK
46093157d7 deleting a notebook deletes its checkpoints
also cleanup a few log messages
2013-05-01 17:32:47 -07:00
MinRK
a3c99d94bb add checkpoint status to notebook header
autosave is also there, but once the dirty flag is an event,
this should stop having the date, and just become 'autosaved / unsaved changes'
2013-05-01 17:32:46 -07:00
MinRK
030c547e58 fix Location headers 2013-05-01 17:32:46 -07:00
MinRK
c8605cd83a ignore checkpoints 2013-05-01 17:32:45 -07:00
MinRK
1f82c03dd2 Save and Checkpoint 2013-05-01 17:32:45 -07:00
MinRK
53ac962d1a sync with previous handler changes
use IPythonHandler, avoid self.application
2013-05-01 17:32:45 -07:00
MinRK
a99a07f10b only save on close if autosaving 2013-05-01 17:32:44 -07:00
MinRK
01bba482a9 *all* user-initiated saves create a checkpoint 2013-05-01 17:32:44 -07:00
MinRK
8ca57a1779 s/autosave_notebook/set_autosave_interval/ 2013-05-01 17:32:43 -07:00
MinRK
80bba145d5 set default autosave interval to two minutes 2013-05-01 17:32:43 -07:00
MinRK
2fe8a9b2cd only autosave when dirty 2013-05-01 17:32:43 -07:00
MinRK
dd77790a00 add autosave timer
autosave interval is tuned based on the duration of saves.
Autosave will never happen more frequently than every 30 seconds,
and if saves take more than 3 seconds, autosave will fire every 10x the duration of the save (i.e. if save takes 6 seconds, it will be every 60 seconds, etc.)
2013-05-01 17:32:42 -07:00
MinRK
6da01bf362 trigger autosave on tab/window close
instead of "please don't leave!"
2013-05-01 17:32:42 -07:00
MinRK
e119a6469b add Revert to the menu bar 2013-05-01 17:32:42 -07:00
MinRK
5bc55ba984 add some checkpoint messages to the notification area 2013-05-01 17:32:41 -07:00
MinRK
db413fadbf expose notebook checkpoints in html/js
- cmd-S does a plain save
- ^M-s does checkpoint
- add save checkpoint to File menu
- save button in bar does checkpoint
2013-05-01 17:32:41 -07:00
MinRK
985289e113 checkpoint info is a dict
two keys: checkpoint_id and last_modified
2013-05-01 17:32:41 -07:00
MinRK
dd234bbc93 add ModifyCheckpoints handler
separates requests that change specified checkpoint IDs from those that do not.
2013-05-01 17:32:39 -07:00
MinRK
62d61cbbc0 add notebook checkpoint handler 2013-05-01 17:31:23 -07:00
MinRK
c4ac8eee36 add checkpoint API to FileNBManager 2013-05-01 17:29:46 -07:00
Min RK
6be220da56 Merge pull request #3235 from ellisonbg/removeprint
Remove the unused print notebook view
2013-04-30 20:12:42 -07:00
Brian E. Granger
56e4759813 Merge pull request #3238 from ellisonbg/tabstyle
Improve the design of the tab completion UI
2013-04-30 20:06:01 -07:00
Brian E. Granger
5cc0897dd6 Fixing styling of context type completions. 2013-04-30 19:44:23 -07:00
MinRK
6e32ee5546 ensure submodules exist prior to doing anything
git submodule update fires before distutils gets fired up
because distutils cannot be trusted.
2013-04-30 16:18:52 -07:00
Erik Tollerud
180f465f16 Collapse -> Close in button description as suggested by @fperez 2013-04-29 20:52:40 -03:00
MinRK
1390270968 use components from external submodule 2013-04-29 16:20:07 -07:00
Erik Tollerud
13b2cadd8b changed ESC to trigger collapsing of the pager in notebook 2013-04-29 19:16:06 -04:00
Erik Tollerud
aafec25d34 Added clickable icon to collapse pager
Closes #3196
2013-04-29 19:15:52 -04:00
MinRK
09adbd4e32 remove components 2013-04-29 16:13:48 -07:00
Brian E. Granger
d9668cdb78 Merge pull request #3190 from minrk/image_size
allow formatters to specify metadata
2013-04-29 15:13:08 -07:00
Min RK
8f2442661f Merge pull request #3234 from ellisonbg/removegrow
Removing old autogrow JS code.

it is no longer necessary
2013-04-29 14:15:39 -07:00