2286 Commits

Author SHA1 Message Date
Yaroslav Halchenko 6cd93f5e1e minor typo: currently -> current 2017-09-07 08:45:23 -04:00
Colton R Bukowsky c0d49b2876 Merge remote-tracking branch 'origin/zenheadmenu' into zenheadmenu 2017-09-04 18:22:31 -07:00
Colton R Bukowsky 2b62c1ccc1 Merge remote-tracking branch 'origin/zenheadmenu' into zenheadmenu 2017-09-04 18:22:22 -07:00
Colton R Bukowsky 16582eb4a4 Merge remote-tracking branch 'origin/zenheadmenu' into zenheadmenu 2017-09-04 18:20:49 -07:00
Colton R Bukowsky 5ad1ab425e Put events object back in 2017-09-04 18:20:40 -07:00
Colton R Bukowsky 3b9bf7fb62 Put events object back in 2017-09-04 09:09:03 -07:00
Colton R Bukowsky d29c75bb98 Merge branch 'master' of github.com:ipython-contrib/jupyter_contrib_nbextensions into zenheadmenu 2017-09-04 09:05:44 -07:00
Jean-François Bercher 8a535dd5d0 [toc2] Highlight on scrolling - update after @jcb91 review 2017-09-04 15:43:31 +02:00
Josh Barnes 18865e33b7 Merge pull request #1078 from jcb91/release
Release 0.3.1
2017-09-04 10:37:59 +01:00
Colton R Bukowsky b721016f04 Merge branch 'master' of github.com:ipython-contrib/jupyter_contrib_nbextensions into zenheadmenu 2017-09-03 20:56:27 -07:00
Colton R Bukowsky e86263f956 Merge remote-tracking branch 'origin/zenheadmenu' into zenheadmenu
# Conflicts:
#	src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js
2017-09-03 19:33:37 -07:00
Colton R Bukowsky 79c9befe44 Merged upstream/master with zenheadmode to include the new Ipython config loader. 2017-09-03 19:31:17 -07:00
Colton R Bukowsky f5eaa91cba rebase onto master and revert zenmode/main.js 2017-09-03 17:55:21 -07:00
Colton R Bukowsky a962047394 Added optional settings to hide/show header and menubar in zenmode. 2017-09-03 17:55:21 -07:00
Josh Barnes 773f00a3d1 release 0.3.1 0.3.1 2017-09-03 22:21:24 +00:00
Josh Barnes 74be466418 fix linting again... 2017-09-03 22:21:11 +00:00
Josh Barnes 282b5d43d8 Add changelog to manifest 2017-09-03 21:55:24 +00:00
Josh Barnes 3b10d1c43e Update changelog for new release 2017-09-03 21:44:26 +00:00
Josh Barnes 3e5effbf50 Merge tag '0.3.0' into release
0.3.0
2017-09-03 09:01:58 +00:00
Josh Barnes 88dc679b39 Merge pull request #1073 from jcb91/conda
Use newer conda version for recipe build test
2017-09-02 22:06:33 +01:00
Josh Barnes d5ec02c2e6 Use newer conda version for recipe build test
Now that the latest version doesn't have the previously-encountered bug
2017-08-31 23:33:43 +01:00
Josh Barnes 646fa6eb82 Merge pull request #1054 from gabyx/codefoldPreprocImprovements
Codefold preprocessor improvements
2017-08-31 12:05:54 +01:00
Josh Barnes 174ed82914 Merge pull request #1069 from jcb91/bugfix
Bugfixes
2017-08-31 12:04:24 +01:00
Josh Barnes 18375762ad Merge pull request #1072 from jcb91/lint
[codefolding] fix linting in preprocessor
2017-08-31 12:03:48 +01:00
Josh Barnes d4d56a5f7e Require newer jupyter_contrib_core and jupyter_nbextensions_configurator
Since the imports have changed for notebook 5.x, and otherwise the
deprecated config key server_extensions gets set, instead of the
currently-used nbserver_extensions
2017-08-31 10:21:43 +01:00
Josh Barnes 4900c5ce9a [codefolding] fix linting in preprocessor 2017-08-31 10:07:16 +01:00
Gabriel Nuetzi 35b6c8f327 import reordering 2017-08-31 08:21:51 +02:00
Gabriel Nuetzi 7c538dda72 Merge branch 'currentMaster' 2017-08-31 08:17:06 +02:00
Josh Barnes 435d29fea3 bugfix in install kwarg conflict check
:O
2017-08-31 02:27:25 +01:00
Colton R Bukowsky 3dcd8ab8e7 rebase onto master and revert zenmode/main.js 2017-08-30 13:23:51 -07:00
Colton R Bukowsky 47d9411518 Merge branch 'master' of github.com:ipython-contrib/jupyter_contrib_nbextensions into zenheadmenu 2017-08-30 11:49:09 -07:00
Josh Barnes fff6550e1f Merge pull request #1059 from jcb91/lint
[lint] fix linting errors, disallow linting failure on Travis
2017-08-30 19:15:01 +01:00
Jean-François Bercher 83fa546deb [toc2] Added missing demo 2017-08-29 22:26:12 +02:00
Jean-François Bercher 1ff3fd9839 [toc2] Scrolling: add a mark to currently displayed section in TOC window (including @jcb91 toc2 amd module) 2017-08-28 15:53:42 +02:00
Colton R Bukowsky 475c3dcfc7 Trying jcb91's changes. 2017-08-26 11:19:19 -07:00
Josh Barnes 7654a48712 Merge pull request #1061 from jcb91/config
[various] use Jupyter.notebook.config instance, where appropriate
2017-08-26 11:03:58 +01:00
Juergen Hasch 459d28bd38 Merge pull request #1063 from juhasch/doc/dragdrop
Add note about native drag&drop support
2017-08-25 20:37:28 +02:00
Josh Barnes 2d395d3a40 Merge pull request #1066 from jfbercher/master
[toc2] tentative fix for #1065 -- update jqueryui cdn and version
2017-08-25 12:28:51 +01:00
Jean-François Bercher 0421874e67 [toc2] tentative fix for #1065 -- update jqueryui cdn and version 2017-08-25 10:55:22 +02:00
Gabriel Nuetzi 3d4df17d51 preserve <img> tags in all cases 2017-08-24 22:46:06 +02:00
Jürgen Hasch 477bca653c Add note about native drag&drop support 2017-08-24 09:22:24 +02:00
Colton R Bukowsky 7963da3afa Added optional settings to hide/show header and menubar in zenmode. 2017-08-23 15:55:22 -07:00
Gabriel Nuetzi b5b383797a linting errors and manicure 2017-08-23 20:56:21 +02:00
Gabriel Nützi 051840b4b4 Merge pull request #1 from soamaven/preembedhtml
Preembedhtml
2017-08-23 20:52:18 +02:00
Gabriel Nuetzi 05bc42bb16 review corrections 2 2017-08-23 20:45:55 +02:00
Gabriel Nuetzi 2526cf19d1 review corrections 2017-08-23 20:41:57 +02:00
Josh Barnes 897652a5e0 release 0.3.0 0.3.0 2017-08-23 18:30:41 +01:00
Josh Barnes 74c9be64a2 [docs] move changes to dedicated CHANGELOG.md 2017-08-23 18:28:28 +01:00
Josh Barnes 9c31bf3e16 Merge pull request #1060 from jcb91/collapsible_headings
[collapsible_headings] bugfix for exporter
2017-08-23 16:51:55 +01:00
Josh Barnes 2b747bcaf4 [various] use Jupyter.notebook.config instance, where appropriate
to avoid reloading (from server!) the same config file for each nbextension.
In most cases this also means we don't need to require the 'services/config' module any longer.
2017-08-23 16:45:27 +01:00