10043 Commits

Author SHA1 Message Date
Matthias Bussonnier
4a16c37caa Merge pull request #2111 from minrk/patch-env
disable all config in tests
2017-02-01 18:44:11 -08:00
Matthias Bussonnier
90d30d2963 Merge pull request #2108 from minrk/merge-server-extensions
merge nbserver_extensions
2017-02-01 17:45:38 -08:00
Matthias Bussonnier
6b4ec572b5 Fix typos. 2017-02-01 17:04:49 -08:00
Matthias Bussonnier
3b82344064 Merge pull request #2116 from gnestor/xterm-css
Add back xterm.css
2017-02-01 16:43:05 -08:00
Grant Nestor
dacfd21942 Add back xterm.css 2017-02-01 15:34:16 -08:00
Min RK
fde1c6e26b handle self.config_dir and self.config_file_name in server_extensions
could be important for subclasses
2017-02-02 00:16:34 +01:00
Min RK
236198571b test dirs are paths, not TempDir objects 2017-02-02 00:04:54 +01:00
Matthias Bussonnier
3c1a25fd96 Merge pull request #2114 from ebraminio/master
Isolate directionality of a string from surrounding
2017-02-01 14:59:26 -08:00
Matthias Bussonnier
90429adba4 Add a menu item to edit keyboard shortcuts. 2017-02-01 14:55:10 -08:00
Ebrahim Byagowi
8ebc59336c Isolate directionality of a string from surrounding 2017-02-01 23:06:03 +03:30
Thomas Kluyver
c807268e4c Clarify where docs are specific to IPython
Closes gh-1504
2017-02-01 12:05:43 -06:00
Min RK
f0d5ccb208 disable all config in tests
avoids in-env config from polluting test environment
2017-02-01 16:27:18 +01:00
Min RK
c31834e064 Merge pull request #2109 from takluyver/appveyor-conda
Try using Miniconda already on Appveyor rather than downloading
2017-02-01 13:24:46 +01:00
Min RK
e70e7be6de remove unused code in nbextensions
- unused imports
- call jupyter_path instead of reimplementing it
2017-02-01 13:12:52 +01:00
Min RK
1797f34210 test merging serverextensions from sys and user config
and refactor mock test environment a bit

ensures no system config files loaded or affected
2017-02-01 13:12:35 +01:00
Thomas Kluyver
c0dd153f5d Try using Miniconda already on Appveyor rather than downloading 2017-02-01 11:27:13 +00:00
Min RK
ad01950c4f Merge nbserver_extensions
Load with ConfigManager so that merge happens recursively,
unlike normal config values.

Makes loading more consistent with frontend extensions,
but is a bit icky because the same files are loaded and read twice,
and one key in a traitlets-defined config file is loaded differently than all others.

This does behave more like we intend and people expect for extensions, though.
2017-02-01 11:17:43 +01:00
Carol Willing
ad805b1c51 Merge pull request #2105 from Carreau/edit-changelog
Start to list new features in changelog
2017-01-31 21:16:12 -08:00
Matthias Bussonnier
7850fae923 Merge pull request #2099 from takluyver/docs-eg-nbs-links
Update some links to example notebooks in docs
2017-01-31 20:44:02 -08:00
Matthias Bussonnier
13cd66a335 Merge pull request #2096 from minrk/edit-shortcuts-link
add edit button to shortcuts dialog
2017-01-31 20:43:02 -08:00
Matthias Bussonnier
9988ce1e6f Start to list new features in changelog 2017-01-31 20:41:39 -08:00
Steven Silvester
2eb7bf1953 Merge pull request #2098 from minrk/double-change-on-disk
avoid stacked "changed on disk" dialogs
2017-01-31 10:13:58 -06:00
Steven Silvester
271c4b1f27 Merge pull request #2095 from minrk/build-watch
restore `npm run build:watch`
2017-01-31 10:10:01 -06:00
Thomas Kluyver
5bb475e1c2 Update nbviewer Github URLs 2017-01-31 16:01:32 +00:00
Thomas Kluyver
1b47ac7248 Restore https 2017-01-31 15:36:43 +00:00
Thomas Kluyver
7aa778166e Update Intersphinx URL for IPython 2017-01-31 15:36:00 +00:00
Thomas Kluyver
9058de7ab7 Remove link to outdated note about roundtrip conversions 2017-01-31 15:34:50 +00:00
Min RK
9ad19e9bf4 avoid stacked "changed on disk" dialogs
check if a previous dialog exists and redisplay it, rather than displaying a stack of modals.
2017-01-31 16:34:47 +01:00
Thomas Kluyver
99ad2091fb Update links to example notebooks
Closes gh-953 (fixing link to markdown cells example nb)
2017-01-31 15:33:37 +00:00
Min RK
20e017b213 add edit button to shortcuts dialog
opens edit-shortcuts dialog
2017-01-31 15:39:19 +01:00
Min RK
2b09d59b1d re-add npm run build:watch
it's not true watching, just polling every few seconds.

Help docs still point to this command,
and we need something for devs as `ignore_minified_js` is gone.
2017-01-31 15:05:36 +01:00
Min RK
5eda1026d3 Merge pull request #2091 from kikocorreoso/ndextension-install-trailing-slash
fix and tests for the issue related with the trailing slash using 'nbextension install'
2017-01-31 14:51:42 +01:00
Min RK
0eff9ef747 Merge pull request #2093 from takluyver/rm-widgets-hardcode
Remove hardcoded widgets check
2017-01-31 12:45:39 +01:00
Thomas Kluyver
934f87201c Merge pull request #2089 from gnestor/4.3.2
Add 4.3.2 to changelog
2017-01-31 11:24:36 +00:00
Thomas Kluyver
0ed0af50b7 Remove hardcoded widgets check
Once this is merged, the notebook will only support ipywidgets>=5.0. The
minimum supported ipywidgets (5.0.0) was released in April 2016.

Closes gh-1960
2017-01-31 11:18:32 +00:00
kikocorreoso
4c9f130953 fix issue with OS in tests 2017-01-31 09:57:29 +01:00
kikocorreoso
97263161e4 fix and tests for the issue related with the trailing slash using 'nbextension install' (see #2069) 2017-01-31 09:31:17 +01:00
Grant Nestor
52ba4c9a4f Update changelog 2017-01-30 16:45:51 -08:00
Thomas Kluyver
ba7e7186cf Merge pull request #2085 from takluyver/i2082
Add swagger yaml file to package_data
2017-01-30 15:14:31 +00:00
Thomas Kluyver
ef32784311 Add swagger yaml file to package_data
Closes gh-2082 (hopefully)
2017-01-30 14:44:33 +00:00
Min RK
bee0f83bdc Merge pull request #2083 from dkrenn/dkrenn/event-change-cell
trigger event change.Cell
2017-01-30 15:23:09 +01:00
Thomas Kluyver
27cfa290b3 Merge pull request #2048 from vidartf/tags-bar
Simple implementation of cell tags
2017-01-30 14:04:56 +00:00
Thomas Kluyver
39b756bf34 Merge pull request #1905 from gnestor/pr/1755
Adds edit and view buttons
2017-01-30 14:04:41 +00:00
Matthias Bussonnier
be5cf10a7d Merge pull request #2065 from jinmehta13/console-welcome-message
Welcome Message for Console and Terminal Output
2017-01-29 11:33:59 -08:00
Daniel Krenn
1bc6e203e1 trigger event change.Cell 2017-01-29 15:08:30 +01:00
Thomas Kluyver
fecab009fd Merge pull request #2078 from parente/fix-missing-kernelspec
Fix JS error on running notebooks tab
2017-01-28 12:19:17 +00:00
Peter Parente
87b5b2ffb0 Fix missing running kernels
When a kernelspec is removed while a kernel spawned from it is in use
the Running tab on the dashboards page errors and no longer shows
any results. Fall back on using the kernel name from the session
in this case so that users can see and terminate kernels.
2017-01-27 21:38:27 -05:00
Min RK
c75a9d8d5a Merge pull request #2077 from kikocorreoso/master
doc typos related with issue #2069
2017-01-27 10:52:00 +01:00
kikocorreoso
72769862f9 doc typos related with issue #2069 2017-01-27 08:59:13 +01:00
Paul Ivanov
ecc3ea04a1 Merge pull request #2076 from gnestor/draggable-dialog
Make dialogs draggable
2017-01-26 14:12:21 -08:00