Commit Graph

5146 Commits

Author SHA1 Message Date
Jonathan Frederic
4495fa5246 Merge pull request #6437 from weichm/patch-1
"event" is not defined error in Firefox
2014-09-15 13:51:14 -07:00
Jonathan Frederic
78db5dc24e Merge pull request #6377 from jasongrout/fix-widget-prefix
Strip the IPY_MODEL_ prefix from widget IDs before referencing them.
2014-09-15 13:40:09 -07:00
Min RK
cd8163677a Merge pull request #6467 from richardeverson/master
Stop websocket timeouts when kernel is suspended
2014-09-15 00:50:37 -07:00
Richard Everson
be80e62340 Check time of last ping before timing out a missing pong. 2014-09-14 23:22:05 +01:00
Min RK
5f27bff2da Merge pull request #6460 from jasongrout/trust
Fix several small bugs in the notebook trust framework
2014-09-12 10:42:41 -07:00
Jason Grout
78ae8b36c5 Fix several small bugs in the notebook trust framework
1. The trust dialog is not called with the notebook context, so we have to use the closure to bind to a notebook event.

2. Replace != with !==

3. The trust_changed.Notebook event default handler expects the trust value to be value key inside an object.  In fact, the event handler is redundant with the code--both seem to set the trust value of the current notebook.
2014-09-12 17:22:03 +00:00
Thomas Kluyver
052f990333 Merge pull request #6445 from minrk/kernelspecs-test
handle system-wide kernelspecs
2014-09-10 15:51:15 -07:00
MinRK
5bc118fb6c handle system-wide kernelspecs
in html tets_kernelspecs_api, which can cause counts to be greater than 2
2014-09-10 14:30:44 -07:00
Thomas Kluyver
fdb375e0ef Merge pull request #6380 from ellisonbg/latex-complete
Adds Julia-style latex->unicode tab completion
2014-09-09 14:27:44 -07:00
Brian E. Granger
669065167b Merge pull request #19 from takluyver/latex-complete-fixes
Latex completion fixes
2014-09-09 13:40:51 -07:00
Thomas Kluyver
bdb5481a1e Remove leftover debugging 2014-09-09 12:47:02 -07:00
weichm
06b2926a0a "event" is not defined error in Firefox
see http://stackoverflow.com/questions/20522887/referenceerror-event-is-not-defined-error-in-firefox
"WebKit follows IE's old behavior of using a global symbol for "event", but Firefox doesn't..."
2014-09-08 21:18:34 +02:00
Matthias Bussonnier
97e99d0661 Merge pull request #6412 from takluyver/sessions-rest-api-fix
Sessions rest api fix
2014-09-06 15:04:13 -07:00
Matthias Bussonnier
6a0fc370fd Merge pull request #6427 from jhamrick/input_ui_generator
Add textbox celltoolbar UI element generator
2014-09-06 14:35:53 -07:00
Jessica B. Hamrick
3aada4008c Rename chkb to text 2014-09-06 14:18:42 -07:00
Matthias Bussonnier
19efa4d195 Merge pull request #6425 from takluyver/docs-separate-defining-magics
Separate doc on defining magics
2014-09-06 14:11:18 -07:00
Jessica B. Hamrick
c3c11e5820 Initial version of textbox celltoolbar ui element 2014-09-06 13:34:43 -07:00
Thomas Kluyver
a47575df63 Fix some doc build warnings 2014-09-06 11:35:14 -07:00
Matthias Bussonnier
3dc94d6911 Merge pull request #6419 from takluyver/sort-test-dir-contents
Sort directory contents in test before assertion
2014-09-05 19:35:57 -07:00
Thomas Kluyver
fa6056e9ed Sort directory contents in test before assertion
Should fix recent test failures, but I can't replicate failure on my
computer, so it's not clear that it's fixed.
2014-09-05 18:44:58 -07:00
Fernando Perez
a5fd908b28 Merge pull request #6408 from minrk/new-cell-code
make default cell type configurable
2014-09-05 18:41:35 -07:00
MinRK
6cee444630 make default cell type configurable
- adds IPython.notebook.default_cell_type
- default is 'code' (matching IPython 2.0)
- special heuristic values include:
  - 'selected': default to selected cell (current master behavior)
  - 'above': default to cell above
  - 'below': default to cell below
2014-09-05 11:28:00 -07:00
Thomas Kluyver
b2737e668e Add tests and fix some issues
Tests taken from #6360
2014-09-05 10:16:37 -07:00
Thomas Kluyver
0e109ee4be Correct comment 2014-09-05 09:40:02 -07:00
Matthias Bussonnier
a855d3c96d Merge pull request #6413 from minrk/default-uri
make the default url customizable
2014-09-04 17:54:04 -07:00
MinRK
dbe65d0cd5 remove unused TreeRedirectHandler 2014-09-04 17:40:48 -07:00
MinRK
379374b5d9 make the default url customizable
this is the page redirected to from `/`,
which defaults to `/tree`.

also changes the redirect code to 302 from 301,
which should cause less grumbling about caching.
2014-09-04 17:40:48 -07:00
Thomas Kluyver
7e681c1c53 Merge pull request #6302 from minrk/ws-heartbeat-timeout
close websocket connections on ping/pong timeout
2014-09-04 15:21:25 -07:00
Matthias Bussonnier
df67bd1720 Merge pull request #6406 from minrk/celltoolbar-rendered
don't hide cell toolbar on rendered text cells
2014-09-04 15:19:59 -07:00
Thomas Kluyver
ca8dabf705 Fix 404 error when accessing nonexistant session 2014-09-04 15:13:59 -07:00
Thomas Kluyver
4c4af25734 Fix failure message for tests 2014-09-04 15:13:59 -07:00
Thomas Kluyver
76b05b24af Handle sessions where the kernel has been killed 2014-09-04 15:13:59 -07:00
Thomas Kluyver
81b06d81a1 Merge pull request #6358 from minrk/contents-missing
fix directory listing with broken symlinks
2014-09-04 14:43:45 -07:00
MinRK
78fdc1ebb4 move mergeopt to utils
from Cell
2014-09-04 11:15:45 -07:00
MinRK
6038612732 don't hide cell toolbar on rendered text cells
because it annoys @Carreau
2014-09-03 17:08:55 -07:00
Matthias Bussonnier
9e8cf39956 Merge pull request #6258 from patricktokeeffe/patch-1
Update custom.js
2014-09-03 10:53:24 -07:00
Min RK
aaa027f503 Merge pull request #6267 from Carreau/less-jq-ui
Remove some jquery-UI classes.
2014-09-02 19:35:45 -07:00
Matthias BUSSONNIER
7752320295 get rid of some jq-ui- style 2014-09-02 17:47:59 -07:00
Min RK
8a0773fd84 Merge pull request #6290 from takluyver/deprecate-rmagic
Deprecate rmagic
2014-09-02 17:16:13 -07:00
Min RK
fbae96f9cb Merge pull request #6269 from takluyver/atomic-save
Implement atomic save
2014-09-02 10:59:38 -07:00
Paul Ivanov
f530a3b56e Merge pull request #6388 from minrk/requests-2.4
catch any exception while waiting for server to start
2014-09-02 10:37:35 -07:00
MinRK
58ecfc2376 catch any exception while waiting to connect
requests 2.4 changed the exception type for a failed connection
2014-08-31 21:50:16 -07:00
Brian E. Granger
a67c7e83a6 Adding tests and limiting CM mode to python 3. 2014-08-29 09:55:40 -04:00
Brian E. Granger
2dfd4079ec Cleaning up and only doing latex completion for python 3. 2014-08-28 21:50:26 -04:00
Brian E. Granger
27f2f6baaa Adding regexp for unicode identifers to CM mode. 2014-08-28 21:42:04 -04:00
Jason Grout
2acee4a269 Strip the IPY_MODEL_ prefix from widget IDs before referencing them. 2014-08-28 19:52:20 +00:00
Paul Ivanov
78918ba827 Merge pull request #6359 from minrk/build-css
build css
2014-08-28 10:35:02 -07:00
Paul Ivanov
583fc21488 Merge pull request #6371 from minrk/dashboard-test-quickfix
minor fixes in dashboard tests
2014-08-28 10:34:01 -07:00
Min RK
509eed56d7 Merge pull request #6370 from minrk/handle-no-checkpoint
fix handling of no-checkpoint-defined
2014-08-28 09:30:43 -07:00
MinRK
fb0421107c minor fixes in dashboard tests
events and regular expressions weren't quite right, which could cause occasional test failures.
2014-08-27 13:51:49 -07:00