Commit Graph

6603 Commits

Author SHA1 Message Date
Thomas Kluyver
5a5f621591 Merge pull request #7247 from Carreau/fix-restore-checkpoint
fix restore checkpoint add an empty cell
2014-12-16 11:07:20 -08:00
Thomas Kluyver
2dbc8f5304 Merge pull request #7248 from Carreau/config-ctm
pass config to contentsManager
2014-12-16 10:07:09 -08:00
Bussonnier Matthias
f0c5de7c7e make method private 2014-12-16 18:13:14 +01:00
Min RK
0c39228307 Merge pull request #7250 from Carreau/kspecbase
fix logo on base_url prefix
2014-12-16 08:39:30 -08:00
Bussonnier Matthias
ddbd7aa4fa add ability to unregister a preset
fix #7218
2014-12-16 17:26:17 +01:00
Jonathan Frederic
6b2333fc51 Merge pull request #7229 from jdfreder/tab-rename
Tab rename - s/Notebooks/Files
2014-12-16 07:58:41 -08:00
Bussonnier Matthias
3bce53e32e fix logo on base_url prefix 2014-12-16 16:37:47 +01:00
Bussonnier Matthias
51f1cad6e4 pass config to contentsManager 2014-12-16 16:11:39 +01:00
Bussonnier Matthias
df418c6a62 fix restore checkpoint add an empty cell 2014-12-16 14:04:20 +01:00
Matthias Bussonnier
449384e85f Merge pull request #7224 from jasongrout/fix-toolbarjs
Fix javascript iteration through array
2014-12-16 11:51:26 +01:00
Matthias Bussonnier
7eb4d1b84d Merge pull request #7225 from Carreau/fix-actions
fix leading underscore
2014-12-16 11:37:57 +01:00
Matthias Bussonnier
efbe695523 Merge pull request #7226 from takluyver/win-sleep-session-tests
Add a brief sleep after shutting down sessions in test teardown
2014-12-16 10:33:53 +01:00
Matthias Bussonnier
420f2337de Merge pull request #7195 from Carreau/manager
generalise manager
2014-12-16 09:37:07 +01:00
Min RK
a7505f012e Merge pull request #7235 from jdfreder/jump-fix
Prevent the page from jumping on tree tab change
2014-12-15 23:10:45 -08:00
Jonathan Frederic
ab1fca9fdb Prevent the page from jumping on tree tab change 2014-12-15 16:30:23 -08:00
Jonathan Frederic
a485fe42ea s/Notebooks/Files 2014-12-15 16:07:45 -08:00
Jonathan Frederic
d9346c002d invoke css 2014-12-15 13:39:28 -08:00
Jonathan Frederic
9e67a34891 Bubble event and implement logic in CodeCell 2014-12-15 13:30:59 -08:00
Matthias Bussonnier
5829ceacb9 s/Json/JSON/g **/*.py 2014-12-15 21:54:54 +01:00
Thomas Kluyver
0178e2add0 Add a brief sleep after shutting down sessions in test teardown
This fixes a test failure for me on my Windows VM. See the comment for
details.
2014-12-15 12:45:45 -08:00
Matthias Bussonnier
420fee5e4c Merge pull request #7163 from jdfreder/refresh-persist
Persist widgets across page refresh
2014-12-15 21:01:14 +01:00
Thomas Kluyver
b408a9bf74 Merge pull request #7167 from minrk/less-2
pin less to 2.x
2014-12-15 11:40:46 -08:00
Jonathan Frederic
2d40eb30d4 Make sure comm-dead is applied to the top widget view class
in all cases where the kernel disconnects.
2014-12-15 11:25:31 -08:00
Min RK
26136f44d2 Merge pull request #7088 from Carreau/kernel.js
Load the per kernel kernel.js and kernel.css
2014-12-15 10:33:35 -08:00
Min RK
420b98dfee Merge pull request #7177 from Carreau/valid-html
Valid html
2014-12-15 10:32:20 -08:00
Bussonnier Matthias
737064d9db fix leading underscore
mering object with itself is stupid otherwise
2014-12-15 18:50:44 +01:00
Jason Grout
efc1fee242 Fix javascript iteration through array
for(var k in config) was assigning k to the properties of Array, not just the numeric indices

the second argument of add_buttons_group, k[1], should be config[k][1]
2014-12-15 17:38:03 +00:00
Matthias Bussonnier
031252d44f Merge pull request #7207 from takluyver/rm-nb-user-config
WIP: Remove js user_config module
2014-12-15 17:17:04 +01:00
Matthias Bussonnier
3a16eed2aa Merge pull request #7204 from jasongrout/widget-warning2
Make the widget warning brief and easy to filter
2014-12-15 17:13:59 +01:00
Matthias Bussonnier
791676006d Merge pull request #7186 from minrk/moment
moment.js-related fixes
2014-12-15 17:11:41 +01:00
Matthias Bussonnier
df1eb9bea2 Merge pull request #7205 from minrk/master
don't cleanup egg-info after every setup.py command
2014-12-15 09:06:15 +01:00
Thomas Kluyver
95e60a544c Update test to modify class config for default_cell_type 2014-12-14 15:21:38 -08:00
Kyle Kelley
4f4e14342b Merge pull request #7172 from Carreau/sort-dashboard
Sort dashbord list in frontend
2014-12-14 14:43:59 -06:00
Thomas Kluyver
65ec04bc8e Merge pull request #7212 from takluyver/kernelspec-package-data
Add kernel resources (logos) to package_data
2014-12-14 11:29:51 -08:00
Matthias Bussonnier
4bd9ac7882 Add json in the base config manager name 2014-12-14 13:21:33 +01:00
Bussonnier Matthias
6f38f7b014 generalise manager 2014-12-14 13:20:04 +01:00
Matthias Bussonnier
df6744d85d enable test coverage on coveralls 2014-12-14 12:38:33 +01:00
Thomas Kluyver
c1ebfd1f3a Add kernel resources directory to package_data 2014-12-13 17:46:25 -08:00
Min RK
b894612b4d Merge pull request #7211 from minrk/warning-test
fix widget-import-warning test
2014-12-13 16:51:08 -08:00
Min RK
7c8f2fd0f5 fix widget-import-warning test
wasn't updated with warning changes
2014-12-13 16:03:03 -08:00
Brian E. Granger
bd57d219fc Merge pull request #7199 from takluyver/python-logo
Use Python logo for IPython kernel
2014-12-12 20:13:59 -08:00
Thomas Kluyver
7f221537d4 Fix default_cell_type option for notebook 2014-12-12 16:52:20 -08:00
Thomas Kluyver
938630b475 Remove user_config js module 2014-12-12 16:48:47 -08:00
Min RK
feee854217 don't cleanup egg-info after every setup.py command
would cause `setup.py css` or any other command 
to effectively uninstall a development install.
2014-12-12 16:31:34 -08:00
Jason Grout
c73933fe90 Make the widget warning easier to catch by specifying the module. 2014-12-13 00:09:43 +00:00
Jason Grout
5c24d8dfb1 Change IPython widget warning to get rid of filenames and line numbers
We do this to not confuse the interactive user
2014-12-12 23:57:17 +00:00
Thomas Kluyver
e51f3ff8d5 Merge pull request #7187 from minrk/utils-js
various fixes in utils.js
2014-12-12 14:48:35 -08:00
Thomas Kluyver
27ad247f9d Enlarge Jupyter logo to 28px height 2014-12-12 14:31:48 -08:00
Nathan Heijermans
408e3fa557 Backing out all changes to the UI and notebook.js.
Updated kernel.js to trigger the ``received_unsolicited_message.Kernel`` event instead. Notebook extensions can handle the event in whatever way they deem appropriate.

A notebook extension that takes advantage of this is available at https://github.com/nheijermans/nbexts.git.
2014-12-12 17:09:44 -05:00
Brian E. Granger
27144e51ff Merge pull request #7162 from jdfreder/persist-fixes
Widget persistence fixes
2014-12-12 13:06:41 -08:00