Brian's Notebook work #899

Merged
merged 23 commits into from Oct 19, 2011

Conversation

Projects
None yet
3 participants
@minrk
Member

minrk commented Oct 18, 2011

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

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Oct 19, 2011

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.

Member

fperez commented Oct 19, 2011

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

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Oct 19, 2011

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.

Member

minrk commented Oct 19, 2011

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.

ellisonbg and others added some commits Sep 6, 2011

@fperez

This comment has been minimized.

Show comment
Hide comment
@fperez

fperez Oct 19, 2011

Member

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

Member

fperez commented Oct 19, 2011

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

@minrk

This comment has been minimized.

Show comment
Hide comment
@minrk

minrk Oct 19, 2011

Member

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

Member

minrk commented Oct 19, 2011

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

fperez added a commit that referenced this pull request Oct 19, 2011

Merge pull request #899 from minrk/nbwork
Internal notebook refactoring and cleanup, plus fixing a bug that prevented Tornado from authenticating users with password.

@fperez fperez merged commit 284cfec into ipython:master Oct 19, 2011

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014

Merge pull request #899 from minrk/nbwork
Internal notebook refactoring and cleanup, plus fixing a bug that prevented Tornado from authenticating users with password.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment