Brian's Notebook work #899

Merged
merged 23 commits into from Oct 19, 2011

3 participants

@minrk
IPython member

This is a rebase of Brian's recent notebook work. It is principally a bit of housekeeping on some files and namespaces, but also fixes a bug preventing the password authentication from working in some environments.

@fperez
IPython member

Everything looks great, except that I'd put the todo.rst file in the docs, not in the code directories. Otherwise good to go.

@minrk
IPython member

Arg - I should have noted that it would be easier to rebase #897 on top of this one, rather than vice versa, since it's only one commit. Shouldn't be a big deal, though.

@fperez
IPython member

Sorry! Just trying to keep up with you and push that open PR count down to 0 :)

@minrk
IPython member

the conflict was tiny. Rebased again, with todo moved to dev docs.

@fperez fperez merged commit 284cfec into ipython:master Oct 19, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment