Commit Graph

7621 Commits

Author SHA1 Message Date
Min RK
b33f6648c7 Merge pull request #94 from Carreau/highlight
re-enable highlighting for ipython kernel
2015-05-15 16:49:04 -07:00
Matthias Bussonnier
ce90bdb2d5 re-enable highlighting for ipython kernel
Default mode is now `text` and not ipython.
so the `ipython` mode was not dispatched.
2015-05-15 09:33:28 -07:00
Min RK
b536da10d8 Merge pull request #90 from minrk/notebook
s/jupyter_notebook/notebook
2015-05-14 11:10:31 -07:00
Min RK
d71a59cc9f s/jupyter_notebook/notebook 2015-05-14 10:49:28 -07:00
Min RK
fb8b83e905 Merge pull request #89 from Carreau/one-config-to-rule-them-all
Store codemirror config in only one location
2015-05-14 10:48:31 -07:00
Min RK
666fdf7157 Merge pull request #91 from takluyver/runtime-dir-absent
Fix list_running_servers when runtime dir not created
2015-05-13 16:33:57 -07:00
Thomas Kluyver
d80247a686 Fix list_running_servers when runtime dir not created
I ran into this now that we actually use $XDG_RUNTIME_DIR, because it's
cleared on restart.
2015-05-13 16:02:22 -07:00
Matthias Bussonnier
faa7eabed4 clarify warning message. 2015-05-13 10:31:39 -07:00
Matthias Bussonnier
a197d4f7f4 Store codemirror config in only one location
Closes (once backported) #EntropyOrg/p5-Devel-IPerl#40
and jupyter/notebook#88
2015-05-13 09:48:31 -07:00
Thomas Kluyver
4be2c7957a Merge pull request #84 from minrk/list_profiles_in_nonexistent
don't list profiles in nonexistent directories
2015-05-12 10:52:08 -07:00
Min RK
fb00f1cb89 don't list profiles in nonexistent directories 2015-05-11 17:19:07 -07:00
Thomas Kluyver
6c0bfd9a9c Merge pull request #80 from minrk/ipyparallel
s/ipython_parallel/ipyparallel
2015-05-11 16:00:47 -07:00
Min RK
3e520e066b s/ipython_parallel/ipyparallel 2015-05-11 13:50:33 -07:00
Matthias Bussonnier
ef20b759bd Merge pull request #78 from takluyver/rm-submodules-mod
Remove git submodule utility functions
2015-05-11 11:23:01 -07:00
Thomas Kluyver
8c2fbe2912 Remove use of the submodule module 2015-05-11 11:08:46 -07:00
Thomas Kluyver
cb9e9b4085 Remove git submodule utility functions
We no longer use submodules
2015-05-11 10:51:43 -07:00
Thomas Kluyver
31884ce6cc Merge pull request #76 from Carreau/no_data_dir
data_dir is not .ipython/kernel anymore.
2015-05-10 21:55:21 -07:00
Matthias Bussonnier
e20131a05b set data_dir in tests 2015-05-10 19:19:59 -07:00
Matthias Bussonnier
6afc1011c4 data_dir is not .ipython/kernel anymore.
On OSX, items ~/Library/Jupyter/ which screw up where things find
kernels and anyway is already at the beginning of the search paths
lists.
2015-05-10 16:57:19 -07:00
Matthias Bussonnier
cc54d7d63f Merge pull request #75 from minrk/omg-js-is-the-worst
disable clean-css restructuring
2015-05-08 17:07:00 -07:00
Min RK
1eb6d153ce disable clean-css restructuring
this is a buggy optimization that breaks some css
2015-05-08 16:46:09 -07:00
Min RK
9af6ed60e3 Merge pull request #74 from Carreau/rename-nbformat
replace jupyter_nbformat by nbformat
2015-05-08 15:07:57 -07:00
Matthias Bussonnier
f47ec80c4f replace jupyter_nbformat by nbformat
Also replace the `import nbformat as nbformat` by `import nbformat`
and change the name of the installed egg.
2015-05-08 14:33:07 -07:00
Matthias Bussonnier
963637a038 Merge pull request #72 from takluyver/sessions-contenttype-json
Set contentType to JSON when sending session models
2015-05-08 13:45:48 -07:00
Min RK
7532e17f85 Merge pull request #73 from minrk/ipykernel
ipython_kernel is ipykernel
2015-05-08 13:45:41 -07:00
Min RK
441c380d3b ipython_kernel is ipykernel 2015-05-08 13:25:37 -07:00
Min RK
7c399ff9c5 Merge pull request #64 from minrk/jupyter_path
remove SYSTEM_NBEXTENSIONS_DIRS
2015-05-08 13:24:28 -07:00
Min RK
c5fe672d65 Merge pull request #54 from jaredly/fix-api-cors
allow OPTIONS requests for api endpoints (to enable CORS)
2015-05-08 11:45:44 -07:00
Thomas Kluyver
cc003550a3 Add some more missing contentType ajax parameters 2015-05-08 11:41:53 -07:00
Min RK
9941d7dc09 Merge pull request #71 from minrk/nbconvert
s/jupyter_nbconvert/nbconvert/
2015-05-08 11:34:45 -07:00
Thomas Kluyver
79cf08eecf Set contentType to JSON when sending session models
Closes ipython/ipython#8416
2015-05-08 11:15:41 -07:00
Min RK
011f60e46b s/jupyter_nbconvert/nbconvert/ 2015-05-08 10:36:45 -07:00
Min RK
8893b178b1 Merge pull request #69 from SylvainCorlay/wrap_jquery_selection
Wrap potentially native element into a jquery selection
2015-05-07 11:18:43 -07:00
Matthias Bussonnier
8b305d331f Merge pull request #67 from takluyver/atomic-writing-2
Alternative way to do atomic writing
2015-05-06 17:08:27 -07:00
Sylvain Corlay
de5e926782 wrap potentially native element into a jquery selection 2015-05-06 23:16:55 +00:00
Thomas Kluyver
bdc226a638 Alternative way to do atomic writing
This is a hopefully more robust way of doing atomic writing of a file.

Previously, we wrote a new temporary file on each write, and renamed it
over the target file on success. This is technically neat, but
constantly recreating the file causes problems with some network
filesystems, and with sync tools like Dropbox.

The new approach copies the old file contents to a temporary file,
overwrites the target using standard open() and write() calls, and then
removes the temporary file. In case of a failure during writing, the
temporary file is renamed over the target, which should preserve the old
data.

This way, we're only using a new inode in case of a write failure, which
is hopefully rare, instead of on successful writes.
2015-05-04 14:05:57 -07:00
Matthias Bussonnier
ecc5f52c66 Merge pull request #63 from minrk/windows-hidden
check FILE_ATTRIBUTE_HIDDEN on Windows
2015-04-30 17:25:19 -07:00
Matthias Bussonnier
5b9bdbf85d Merge pull request #57 from rsmith31415/fix-firefox-print-preview
Fix print preview in Firefox
2015-04-30 17:21:01 -07:00
Min RK
7706b6832d remove SYSTEM_NBEXTENSIONS_DIRS
use SYSTEM_JUPYTER_PATH from core

for common logic with kernelspec installation
2015-04-30 12:44:29 -07:00
Min RK
5ba96d6604 check FILE_ATTRIBUTE_HIDDEN on Windows
in is_hidden
2015-04-30 10:12:48 -07:00
Min RK
4dcd67a0de Merge pull request #61 from jupyter/pip-install-all-in-one
Pip install all-in-one
2015-04-29 16:21:11 -07:00
Kyle Kelley
f40c631683 Pip install all-in-one 2015-04-29 18:13:29 -05:00
Robert Smith
611e662adf Fix print preview in Firefox 2015-04-29 00:15:49 -05:00
Min RK
4df64e7d98 Merge pull request #48 from takluyver/window-terminal
Expose JS terminal object on window
2015-04-27 11:36:44 -07:00
Min RK
6bec6c9b80 Merge pull request #40 from minrk/rm-widgets
remove widgets
2015-04-27 11:36:27 -07:00
Min RK
51375f118f Merge pull request #51 from takluyver/genutils_released
Remove genutils from requirements.txt
2015-04-27 11:36:23 -07:00
Jared Forsyth
9a57daa34d allow OPTIONS requests for api endpoints (to enable CORS) 2015-04-25 23:11:06 -06:00
Thomas Kluyver
9783031ee7 Remove genutils from requirements.txt
It's now on PyPI, so normal installation should work.
2015-04-24 15:40:21 -07:00
Thomas Kluyver
89380e456b Merge pull request #50 from minrk/termsocket-handlers
disable set_default_headers on TermSocket
2015-04-24 15:24:06 -07:00
Min RK
a70f1e220e disable set_default_headers on TermSocket
inherited from IPythonHandler, but doesn't make sense or work on websockets.
2015-04-24 13:49:11 -07:00