Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mergesplit #1261

Closed
wants to merge 44 commits into from
Closed

Mergesplit #1261

wants to merge 44 commits into from

Commits on Jan 12, 2012

  1. Configuration menu
    Copy the full SHA
    813d390 View commit details
    Browse the repository at this point in the history
  2. Removing old directory.

    ellisonbg committed Jan 12, 2012
    10 Configuration menu
    Copy the full SHA
    e075f09 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f5bcb68 View commit details
    Browse the repository at this point in the history
  4. Cleaning up menu code.

    * QuickHelp button has been removed in favor of a Help menu item.
    * Keyboard shortcuts are now in the menus.
    * Numerous fixes to subtle aspects of the wijmenu implementation.
    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    a178e6e View commit details
    Browse the repository at this point in the history
  5. Improved notebook renaming.

    There is not a rename dialog that is available in the File menu and
    when you click on the notebook name.
    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    098a37f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4103005 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    baad1b9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    fe3a6c4 View commit details
    Browse the repository at this point in the history
  9. Removing old wijmo themes.

    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    def8269 View commit details
    Browse the repository at this point in the history
  10. Adding jquery base theme.

    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    c000f0b View commit details
    Browse the repository at this point in the history
  11. Removing old jquery.

    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    344a0df View commit details
    Browse the repository at this point in the history
  12. Removing old jqueryui.

    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    8d87e23 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    406bcc2 View commit details
    Browse the repository at this point in the history
  14. Adding latest jquery.

    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    1681e36 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    8ae049e View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c1ab632 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    096f072 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    d401727 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    e77516b View commit details
    Browse the repository at this point in the history
  20. Improving the save notification.

    * Added last saved with time/date display.
    * Reimplemented save widget status updates.
    ellisonbg committed Jan 12, 2012
    Configuration menu
    Copy the full SHA
    25301e0 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    c7352db View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    01e915f View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    c29ee28 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    8ca5592 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    d10550f View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    88738d0 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2012

  1. Merge pull request ipython#1229 from takluyver/i1225

    Fix display of SyntaxError in Python 3, plus various cleanups to exception-handling machinery.
    
    Closes ipython#1225.
    fperez committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    3782b5c View commit details
    Browse the repository at this point in the history
  2. kernel heartbeat does not share zmq context with rest of the app

    This prevents the heartbeat from ever waiting for the GIL, which
    could cause erroneous heartbeat failures.
    minrk committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    ad971e3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e81bf6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a8dc95a View commit details
    Browse the repository at this point in the history
  5. fix null comparisons in sqlitedb backend

    associated test added and passing
    minrk committed Jan 13, 2012
    Configuration menu
    Copy the full SHA
    ec3188c View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2012

  1. Configuration menu
    Copy the full SHA
    6c32815 View commit details
    Browse the repository at this point in the history
  2. Merge pull request ipython#1262 from minrk/hbgil

    Heartbeat no longer shares the app's Context
    
    Fixes in both the single and parallel kernels, preventing the heartbeat thread from sharing the zmq Context with the rest of the process.  Non-copying sends require grabbing the GIL from the zmq io-thread in order to free memory, which could let Python get in the way of the heartbeat.
    
    Test script and notebook added to examples directory.
    
    closes ipython#1260
    minrk committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    1c4daed View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    05f49f2 View commit details
    Browse the repository at this point in the history
  4. add NoDB for non-recording Hub

    When used, this disables database-based actions in the Hub.
    
    Useful for minimizing Hub memory consumption.
    minrk committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    1aaad01 View commit details
    Browse the repository at this point in the history
  5. Merge pull request ipython#1253 from ivanov/profile_auto_create

    set auto_create flag for notebook apps
    
    Fixes first use of bundled profiles when used with the notebook (e.g. ipython --profile=sympy).
    minrk committed Jan 14, 2012
    Configuration menu
    Copy the full SHA
    9bb4034 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2012

  1. Configuration menu
    Copy the full SHA
    7c46401 View commit details
    Browse the repository at this point in the history
  2. Merge pull request ipython#1257 from minrk/kmclass

    use self.kernel_manager_class in qtconsoleapp
    
    Subclasses of QtConsoleApp can now override kernel_manager_class with their own version.
    minrk committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    5d833ca View commit details
    Browse the repository at this point in the history
  3. Merge pull request ipython#1222 from minrk/mapreference

    allow Reference as callable in map/apply
    
    This allows behaviors like:
    
        rf = parallel.Reference('f')
        ar = view.map(rf, *sequences)
    
    where the function 'f' is defined on the engines, and can even be different.
    minrk committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    5608bfe View commit details
    Browse the repository at this point in the history
  4. Merge pull request ipython#1267 from minrk/nodb

    add `--nodb` option for non-recording Hub
    
    This allows simple use cases to avoid needing to call `purge_results` to prevent memory growth of the Hub.
    minrk committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    80c3873 View commit details
    Browse the repository at this point in the history
  5. Merge pull request ipython#1213 from punchagan/minor-typo

    Fix minor typo in history_console_widget.py
    minrk committed Jan 16, 2012
    Configuration menu
    Copy the full SHA
    9e5238d View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2012

  1. Configuration menu
    Copy the full SHA
    58bba9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f0b864b View commit details
    Browse the repository at this point in the history
  3. 2 Configuration menu
    Copy the full SHA
    43ce2e5 View commit details
    Browse the repository at this point in the history