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

Update from upstream #1

Merged
merged 4,284 commits into from
May 17, 2017
Merged

Update from upstream #1

merged 4,284 commits into from
May 17, 2017

Conversation

juejung
Copy link
Owner

@juejung juejung commented May 17, 2017

No description provided.

ccordoba12 and others added 30 commits March 14, 2017 13:04
PR: Add missing signal to convert notebooks from the project explorer
- Replace native_look for native icons.
- Delete unused static method get_system_bck_color.
- Use scope_highlight_color based in sideareas_color.
- Avoid one innecessary restart at startup,
- Also change the name to extra_path to make it more generic.
PR: Don't fail while running tests if coveralls fails for whatever reason
PR: Add missing parameter to copy contents with the format defined in array editor
dougthor42 and others added 28 commits May 12, 2017 14:03
+ Added default value of `True` to spyder/config/main.py
+ Added checkbox to Editor -> Display -> Interface option dialog
  in spyder/plugins/editor.py
+ Added method to set class/func dropdown visibility to
  spyder/widgets/editor.py.
PR: Add a new panel to show/explore class and methods/functions present in the current file
PR: Complete annotation types in Preferences and Source toolbox
PR: Several Find in Files improvements
Fixes #4197
Fixes #4134
Fixes #2963
Fixes #2850
Fixes #2730
Fixes #1555

Conflicts:
- spyder/app/mainwindow.py
- spyder/config/main.py
- spyder/widgets/findinfiles.py
PR: Fix error in Find in Files because of changes in master
PR: Disable tab with setting when indent chars are spaces.
PR: Fix indentation error when a line starts with return but it's not a return statement
@juejung juejung merged commit af01808 into juejung:master May 17, 2017
@juejung
Copy link
Owner Author

juejung commented May 17, 2017

Update from upstream master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants