Commit Graph

3375 Commits

Author SHA1 Message Date
Thomas Kluyver
3e2f6dba98 logo-64 -> logo-64x64 2014-12-09 14:05:55 -08:00
Thomas Kluyver
4cee2f5f3a Merge pull request #7128 from minrk/more-v-less-m
A little more V, a little less M in the text editor
2014-12-09 14:03:04 -08:00
Thomas Kluyver
7cc07251e4 Use double resolution logo to support hires displays 2014-12-09 12:11:02 -08:00
Jason Grout
49541066f1 Update viewlists to store a list of promises for views 2014-12-09 19:36:39 +00:00
Min RK
615ff9f138 Merge pull request #6789 from jdfreder/persistence2
Widget persistence API
2014-12-09 11:24:08 -08:00
Thomas Kluyver
cad0c32137 Hide kernel logo if it's missing 2014-12-09 10:54:38 -08:00
Thomas Kluyver
f123b0d2ad Initial support for supplying kernel logos in kernel spec 2014-12-09 10:53:53 -08:00
Jonathan Frederic
2cc041444a Explicit 2.5px 2014-12-09 10:35:02 -08:00
Jonathan Frederic
cf9b092013 Use once instead of on 2014-12-09 10:26:35 -08:00
Matthias Bussonnier
134488637c Merge pull request #6977 from minrk/finish-5384
Add authentication configuration
2014-12-09 09:12:50 +01:00
Thomas Kluyver
9f48e86477 Merge pull request #7136 from minrk/octet-stream
set default mimetype to octet-stream for binary files
2014-12-08 18:23:31 -08:00
Jonathan Frederic
cb12229480 Fix padding of widgets. 2014-12-08 17:32:43 -08:00
Jonathan Frederic
52c8f14223 Added changes discussed with @jasongrout 2014-12-08 17:18:10 -08:00
Jonathan Frederic
152982efcd Updated comments to new style. 2014-12-08 17:18:10 -08:00
Jonathan Frederic
0978065269 Remove view.show 2014-12-08 17:18:10 -08:00
Jonathan Frederic
a56a6f5657 Document set_state_callbacks and,
make load_state callback support promises.
2014-12-08 17:18:10 -08:00
Jonathan Frederic
0c737867fe Rebase fixes 2014-12-08 17:18:10 -08:00
Jonathan Frederic
16e3bad23f Address @jasongrout 's review comments, take 2 2014-12-08 17:18:10 -08:00
Jonathan Frederic
5d4b83ba4a Add an event that fires before the notebook saves 2014-12-08 17:18:10 -08:00
Jonathan Frederic
71d2d47036 Fix, only return views that are direct children of the cell 2014-12-08 17:18:10 -08:00
Jonathan Frederic
a53f4cc9dd Log save state callback failures 2014-12-08 17:18:09 -08:00
Jonathan Frederic
db62a210e7 Another that = this 2014-12-08 17:18:09 -08:00
Jonathan Frederic
f060947eb9 This, that, and the other thing 2014-12-08 17:18:09 -08:00
Jonathan Frederic
8a5770b811 Add convenience API 2014-12-08 17:18:09 -08:00
Jonathan Frederic
e02a5ec201 Promises... 2014-12-08 17:18:09 -08:00
Jonathan Frederic
d466601dbb Persistence API,
This is a combination of 10 commits.
Enable widget instanciation from front-end.

Address @minrk 's review comments.

Make API that allows users to persist widget state easily.

Added support for view persistence

Started adding support for model persistence.

Half way there!

Finished persistence API.

Move persistence code into the widget framework.

Fin.

Bug fixes
2014-12-08 17:18:09 -08:00
Scott Sanderson
ccc8cb9cbf Minor cleanups in the contents API.
Noticed while poking around with a linter enabled.
2014-12-08 19:22:03 -05:00
Min RK
f0181836b2 run test server in thread
instead of subprocess
2014-12-08 15:50:02 -08:00
MinRK
1ec9cfc25c use IOLoop.current in a few places
better allow notebook server to run in a thread
2014-12-08 15:47:56 -08:00
Min RK
407e63cb80 set default mimetype to octet-stream for binary files
mimetype only specified if content=True
2014-12-08 14:31:32 -08:00
Min RK
6c4f8de34a wrap lines by default
because long lines are not handled well
2014-12-08 12:04:51 -08:00
Thomas Kluyver
8160308bb2 Merge pull request #7120 from Carreau/fix-widget-load
lazy load widgets
2014-12-08 11:52:53 -08:00
Min RK
1e5bd77bda s/mode/language/
for user-facing CodeMirror mode (hover text, language menu)
2014-12-08 11:37:01 -08:00
Min RK
c81609f5d6 redirect /edit/ to /files/ if not (utf8) text 2014-12-08 11:34:21 -08:00
Min RK
85fb8e1085 use $.map for setting cm options 2014-12-08 11:05:17 -08:00
Min RK
8c2ced501d address review in custom auth 2014-12-08 10:51:14 -08:00
Min RK
c71d4162e3 make logout_handler overridable 2014-12-07 14:46:00 -08:00
Min RK
dbb5e9a107 allow LoginHandler to override get_current_user 2014-12-07 14:10:54 -08:00
Min RK
bb01b716e0 allow login_handler to be undefined
(for use outside IPython)
2014-12-07 14:10:53 -08:00
Min RK
16d1f0fd84 update custom auth per review
- pass settings around, not applications
2014-12-07 14:10:53 -08:00
Phil Elson
d81990c941 Added authentication configuration for the notebook app. 2014-12-07 14:10:52 -08:00
Min RK
7ede5e291f update mode on rename 2014-12-07 14:01:27 -08:00
Min RK
03779746ab Toggle line numbers in menu
use 'Toggle' text, instead of switching between Show/Hide
2014-12-07 13:55:06 -08:00
Min RK
0b8920193f add Mode menu to editor 2014-12-07 13:40:42 -08:00
Min RK
a53d467243 update edit page blocks after layout changes 2014-12-07 13:40:16 -08:00
Min RK
0cc0dead5d add File/Rename 2014-12-07 13:11:22 -08:00
Min RK
d6282035fa add save widget to text editor 2014-12-07 13:11:22 -08:00
Min RK
c58070a702 make savewidget css a little more generic
- use classes instead of IDs
- use .filename instead of #notebook_name
2014-12-07 13:11:20 -08:00
Min RK
0dfcc1b512 expect JSON reply to save 2014-12-07 13:10:15 -08:00
Min RK
c238553a4e set application/json on contents model replies 2014-12-07 13:10:15 -08:00
Min RK
2452c0c2f7 checkpoint 2014-12-07 13:10:15 -08:00
Min RK
928c81df9d setting an option to null sets the default in CodeMirror
matching the unset behavior in config
2014-12-07 13:10:15 -08:00
Min RK
c8a1f06179 fixup keyMap 2014-12-07 13:10:15 -08:00
Min RK
54324633ca fixup 2014-12-07 13:10:14 -08:00
Min RK
0c42d3659e add File/New in editor 2014-12-07 13:10:14 -08:00
Min RK
ab7b35afdb link to /edit/ on files 2014-12-07 13:10:14 -08:00
Min RK
85b6b280b2 allow selecting codemirror keymap in menu 2014-12-07 13:10:14 -08:00
Min RK
9a504dd7c3 basic LESS for editor 2014-12-07 13:10:14 -08:00
Min RK
776c9a0316 track dirty state in editor for onbeforeunload 2014-12-07 13:10:13 -08:00
Min RK
0efd335553 editor progress
- load/store codemirror config
- fill out menus a bit:
  - Edit/find,replace
  - View/toggle line numbers
2014-12-07 13:10:13 -08:00
Min RK
ee00dcf083 docstring 2014-12-07 11:20:30 -08:00
Min RK
f2343e4ec5 update --script behavior to use nbconvert --to script 2014-12-07 11:18:59 -08:00
Min RK
1731b9b449 --script triggers post_save hook with nbconvert 2014-12-07 11:18:59 -08:00
Min RK
58c0a97ec3 add pre/post-save hooks
- `ContentsManager.pre_save_hook` runs on the path and model with content
- `FileContentsManager.post_save_hook` runs on the filesystem path and model without content

- use pre_save_hook for things like stripping output
- use post_save_hook for things like nbconvert --to python
2014-12-07 11:18:58 -08:00
Min RK
0b46e2aff2 remove some custom css
mainly in navbars, where we were doing custom
things that bootstrap already did with classes.

This did require the removal of multiple class LESS inheritance for
navbar buttons, because it doesn't work properly. Seems like a LESS bug, but I'm not sure.
2014-12-07 11:16:15 -08:00
Thomas Kluyver
11f089aedb Handle nbserver info files without pid, from IPython 2.x
Fixes takluyver/nbopen#9
2014-12-06 14:24:21 -08:00
Bussonnier Matthias
affdb6a8ff fix test 2014-12-06 22:13:04 +01:00
Nicholas Bollweg (Nick)
d3601f90ef checking in css 2014-12-06 14:18:51 -05:00
Nicholas Bollweg (Nick)
c72ad2754c more fidgeting before starting over 2014-12-06 14:18:51 -05:00
Nicholas Bollweg (Nick)
5858350cc3 handling explicitly provided modes from kernelspec.language_info 2014-12-06 14:18:51 -05:00
Nicholas Bollweg (Nick)
eef949eda9 fixing tests 2014-12-06 14:18:05 -05:00
Nicholas Bollweg (Nick)
8f5b447eaf removing monkeypatch, importing rest of codemirror default theme 2014-12-06 14:18:05 -05:00
Nicholas Bollweg (Nick)
68c4714338 using codemirror mode/meta for detection 2014-12-06 14:18:04 -05:00
Matthias Bussonnier
a9fffc41ab Merge pull request #6950 from minrk/new-new-dropdown
Add kernel-select dropdown to new notebook button
2014-12-06 15:50:20 +01:00
Thomas Kluyver
615f5dd13a Merge pull request #7118 from minrk/script-dispatch
Dispatch to custom exporter in ScriptExporter
2014-12-05 17:02:16 -08:00
Min RK
93bbf6d52e remove nbconvert_exporter handling from frontend
dispatch happens in the script exporter,
frontend doesn't need to know about it anymore.
2014-12-05 16:03:05 -08:00
Min RK
befb16ebe3 Merge pull request #6948 from bollwyvl/graceful-mathjax-widgets
Ignore failure of widget MathJax typesetting
2014-12-05 15:40:39 -08:00
Min RK
b10ebdad4b s/current_selection/default_kernel/ 2014-12-05 14:04:16 -08:00
Min RK
6a1cebe4c0 minor reflow of tree header
- remove absolutely positioned text (absolute text doesn't wrap correctly)
- associate hidden upload directly with 'click here' via span
- remove column split, rely on regular reflow
2014-12-05 13:08:55 -08:00
Min RK
371b031f40 informative hover text for current selection 2014-12-05 12:21:39 -08:00
Min RK
d1bda196b7 remove some weird tabs
How did they get there? We may never know...
2014-12-05 12:16:45 -08:00
Min RK
fbaae651ad remove UI for setting default kernel
can be set with:

    IPython.new_notebook_widget.set_default_kernel('kernel_name')
2014-12-05 12:15:46 -08:00
Min RK
8eb6ec00d8 store current kernel selection in frontend config
instead of localStorage
2014-12-05 12:06:55 -08:00
Min RK
11ef669ec6 kernelspecs is a dict
sort menus client-side
2014-12-05 12:06:55 -08:00
Min RK
d9767e8c94 separate selecting default kernel from new notebook with specified kernel
adds checkmark to indicate selection
2014-12-05 12:06:55 -08:00
Min RK
0cfd8731a0 include current kernel name in new notebook dropdown 2014-12-05 12:06:55 -08:00
Min RK
d312486840 Add kernel-select dropdown to new notebook button
most recent choice is remembered in localStorage
2014-12-05 12:06:54 -08:00
Min RK
f94e482478 handle undefined settings in promising_ajax 2014-12-05 12:06:53 -08:00
Min RK
4fc163812a change kernel spec placeholder name to 'Kernel' 2014-12-05 12:06:25 -08:00
Min RK
696394e27d allow kernel_name to be specified in url parameter 2014-12-05 12:06:24 -08:00
Min RK
9e809126e4 add utils.get_url_param
I really cannot believe that we need to write this ourselves
2014-12-05 12:06:24 -08:00
Thomas Kluyver
c3cb2164f6 Clear output after replacing cell contents 2014-12-05 10:58:59 -08:00
Thomas Kluyver
90817ccb1f Machinery to replace the current cell instead of adding a new one 2014-12-05 10:58:58 -08:00
Matthias Bussonnier
b12ac2cb15 Merge pull request #7011 from jdfreder/killthelayout
Kill the layout manager
2014-12-05 19:31:24 +01:00
Jonathan Frederic
e519371402 Merge pull request #7093 from jasongrout/model-views
Make the model.views dict a dict of promises for views
2014-12-05 08:31:06 -08:00
Kyle Kelley
dbf11e02fd Merge pull request #7107 from jdfreder/import_warning
Add warning to widget namespace import.
2014-12-04 22:48:29 -06:00
Jonathan Frederic
5e7d1cfa9f Add dark lower border to pager handle 2014-12-04 20:33:25 -08:00
Nicholas Bollweg (Nick)
83757b6a0e moving typeset to utils, usage in cell and outputarea 2014-12-04 21:06:34 -05:00
Jonathan Frederic
e7330f5e22 Address @carreau 's review comments 2014-12-04 17:11:24 -08:00
Jonathan Frederic
80bfe779f5 Add warning to widget namespace import. 2014-12-04 15:38:13 -08:00
Jason Grout
9ca509d915 Merge remote-tracking branch 'public-upstream/master' into links-rebase
Conflicts:
	examples/Interactive Widgets/Widget Events.ipynb
2014-12-04 19:11:33 +00:00
Nicholas Bollweg (Nick)
c95a9aaf80 accept node or selection 2014-12-04 11:03:30 -05:00
Nicholas Bollweg (Nick)
b17a40d950 moving typeset to DOMWidgetView 2014-12-04 11:03:30 -05:00
Nicholas Bollweg (Nick)
57f05c4a2b reversing order of arguments, as text may already exist 2014-12-04 11:03:29 -05:00
Nicholas Bollweg (Nick)
00fc31b0a8 also setting text in widget.typset 2014-12-04 11:02:10 -05:00
Nicholas Bollweg (Nick)
9cd878cf0f moving, checking MathJax typesetting to WidgetView
widget rendering should not fail hard if MathJax is not available
2014-12-04 11:01:00 -05:00
Matthias Bussonnier
de52775797 Merge pull request #7078 from takluyver/kernelpath
Rework get_kernel_path logic
2014-12-04 16:59:54 +01:00
Jason Grout
155381072c Make the favicon a template block 2014-12-04 00:35:28 +00:00
Jason Grout
26bec1ad36 Add None as a widget visible value to allow for visiblity: hidden
Now, visible can have three values:
  * True - show the widget
  * False - hide the widget and collapse the empty space
  * None - hide the widget and show the empty space
2014-12-04 00:27:59 +00:00
Jonathan Frederic
c0f01d65e8 Increase pager handle size. 2014-12-03 14:29:20 -08:00
Jonathan Frederic
ebb6e818a7 Fix, prevent notebook from having its height set on pager display 2014-12-03 14:29:20 -08:00
Jonathan Frederic
e79a43e867 Fix scroll/resize handle missing behavior. 2014-12-03 14:29:20 -08:00
Jonathan Frederic
a7d54cd512 Fix scrolling for large outputs 2014-12-03 14:29:20 -08:00
Jonathan Frederic
353a9afd34 Kill the layout manager 2014-12-03 14:29:20 -08:00
Jonathan Frederic
5a9e4d7986 Manual fixes 2014-12-03 13:46:34 -08:00
Jonathan Frederic
b53386b37b Ran function comment conversion tool 2014-12-03 13:42:43 -08:00
Jason Grout
13c1b95fbd Make the model.views dict a dict of promises for views
Otherwise, there is a race condition where the model doesn't know about views until they are actually created.
2014-12-03 19:30:05 +00:00
Jonathan Frederic
2969de609d Selection test fix 2014-12-03 10:52:25 -08:00
Jonathan Frederic
91524a1379 Merge pull request #7057 from Carreau/jsdoc
Move js doc into function themselves.
2014-12-03 08:51:55 -08:00
Thomas Kluyver
3cad1f4b4d Expose ConfigManager one level up the hierarchy
Because `from IPython.html.services.config import ConfigManager` is long
enough.
2014-12-02 16:51:35 -08:00
Min RK
6ba1584b4a Merge pull request #7016 from rgbkrk/csp
Use Content Security Policies instead of X-Frame-Options
2014-12-02 15:56:20 -08:00
Jason Grout
63f8566c6f Wait for any promises returned by a view's render method before considering the view created
This lets a view wait on children views to be created before considering itself created.

Thanks to @ssunkara for catching this.
2014-12-02 22:38:19 +00:00
Jonathan Frederic
22168a538e Typo fix 2014-12-02 13:18:55 -08:00
Kyle Kelley
a6d3d6a93e Log warning directly. 2014-12-02 15:12:14 -06:00
Kyle Kelley
858d153bff Remove extraneous pass
YOU SHALL NOT PASS!
I rap fast like Shadowfax!
2014-12-02 15:12:14 -06:00
Kyle Kelley
7a48687929 Update CSP tests for new default. 2014-12-02 15:12:14 -06:00
Kyle Kelley
219ca3046a Clean up default content security policy setup 2014-12-02 15:12:14 -06:00
Kyle Kelley
17d1c2d488 Report CSP violations as warnings. 2014-12-02 15:12:14 -06:00
Kyle Kelley
5343787e9d Remove CSP reporting since it fills console. 2014-12-02 15:12:14 -06:00
Kyle Kelley
0c22c140c3 Turn x-frame-options tests into CSP tests 2014-12-02 15:12:14 -06:00
Kyle Kelley
392118d536 One unified CSP report URI 2014-12-02 15:12:13 -06:00
Kyle Kelley
5065429bfd Clean up logs, enable debug log for header except 2014-12-02 15:12:13 -06:00
Kyle Kelley
bd85ff25df Restrict frame-ancestors to 'self' in CSP 2014-12-02 15:12:13 -06:00
Kyle Kelley
7fb8cd94ec Load the security service handlers.
Conflicts:
	IPython/html/notebookapp.py
2014-12-02 15:12:13 -06:00
Kyle Kelley
3068733c46 Log reporter policy to debug 2014-12-02 15:12:13 -06:00
Kyle Kelley
cb19f07c9a csp_report_uri caused a cyclic dependency 2014-12-02 15:12:13 -06:00
Kyle Kelley
5b53d2db45 Set default policy to nothing, only report. 2014-12-02 15:12:13 -06:00
Kyle Kelley
23b9f09177 Log CSP violations via report 2014-12-02 15:12:13 -06:00
Kyle Kelley
1f03954dd8 Handle CSP Reports 2014-12-02 15:12:13 -06:00
Kyle Kelley
a00d6930f2 Adapt headers to using Content Security Policy 2014-12-02 15:12:12 -06:00
Thomas Kluyver
d273b56044 Clean up get_kernel_path logic 2014-12-02 11:54:19 -08:00
Jonathan Frederic
01a6929c0d Fix faulty interact tests 2014-12-02 09:29:02 -08:00
Jonathan Frederic
592112f0fa Don't magically convert values to a list of tuples. 2014-12-02 09:22:16 -08:00
Kyle Kelley
a19f345170 Merge pull request #7007 from Carreau/less-update
Less update
2014-12-02 08:13:02 -06:00
Jonathan Frederic
c8ef47b03b Fix readonly lock logic. 2014-12-01 16:27:17 -08:00
Thomas Kluyver
1929f5702c Merge pull request #6945 from minrk/kernel-info-lang
fix loading of language name from kernel_info
2014-12-01 14:17:59 -08:00
Jonathan Frederic
139dca277b Merge pull request #7059 from silviav12/widget_docstring
Add docstring documentation for widget_float
2014-12-01 13:24:06 -08:00
silviav12
a803717c5d Removed the two empty lines of dosctring in widget_float.py. 2014-12-01 20:45:16 +00:00
Bussonnier Matthias
a2b35cb869 use less variable for rounded corner
and allow none in versions comparison
2014-12-01 21:31:34 +01:00
Min RK
0a36fb6cdc Merge pull request #7068 from Carreau/close-pager
close pager on escape on command mode
2014-12-01 12:25:13 -08:00