Commit Graph

9349 Commits

Author SHA1 Message Date
Carol Willing
4362f03227 Update link to Contributor guides 2016-06-11 04:42:42 -07:00
Sylvain Corlay
a91af4d642 Update traitlets API 2016-06-10 17:27:00 -04:00
Min RK
710dcd6299 reverse nbconfig load order
list is in descending priority, so load should iterate back to front, to ensure user config wins
2016-06-10 15:21:19 +02:00
Safia Abdalla
0153883fe5 Merge pull request #1522 from jupyter/willingc-patch-1
Update ReadTheDocs link in CONTRIBUTING file
2016-06-07 15:45:24 -05:00
Carol Willing
fcbe6b52df Update ReadTheDocs link in CONTRIBUTING file 2016-06-07 13:08:58 -07:00
Min RK
6ae0083ef1 Merge pull request #1520 from vanillajonathan/patch-2
Changed string "sub-structure" to "substructure"
2016-06-07 15:50:22 +02:00
Min RK
fe1490fedb Merge pull request #1519 from vanillajonathan/patch-1
Add title attribute to image tag
2016-06-07 15:49:42 +02:00
Jonathan
243b915646 Changed string "sub-structure" to "substructure" 2016-06-07 14:30:14 +02:00
Jonathan
b5d8d45ab8 Add title attribute to image tag 2016-06-07 14:26:04 +02:00
Min RK
caca248b6f Merge pull request #1518 from chultquist/master
Allow requests to POST in OPTIONS requests
2016-06-07 11:01:42 +02:00
chultquist
144807bc3c Allow requests to POST in OPTIONS requests
Commit 65eb248209 introduced a bug by not allowing the POST method in OPTIONS requests (which is wrong since several parts of the API accept POST requests, for example creating a new kernel).
2016-06-07 09:52:21 +01:00
Min RK
02f8b11fc5 Merge pull request #1515 from minrk/setup-doesnt-require-genutils
setup doesn't require genutils
2016-06-06 14:58:19 +02:00
Min RK
f41aaa17c9 Merge pull request #1490 from blink1073/external-codemirror
Unify the codemirror imports
2016-06-06 10:41:53 +02:00
Min RK
151bbb9d79 setup doesn't require genutils
the dependency is gone, but it was still declared
2016-06-04 21:46:23 +02:00
Matthias Bussonnier
2cbc322467 Merge pull request #1468 from jtyberg/allow-root
Allow root user to run tests.
2016-06-03 17:18:09 -07:00
Min RK
a90857d463 Merge pull request #1511 from minrk/4.2-changes
changes for 4.2.1
2016-06-03 22:01:25 +02:00
Min RK
a12e6e4d05 changes for 4.2.1 2016-06-03 13:51:20 +02:00
Jason Grout
c94cb141fb Merge pull request #1506 from blink1073/remove-lab
Remove hard-coded JupyterLab in favor of a server extension
2016-06-02 14:49:33 -04:00
Steven Silvester
45e16b2278 Remove lab from the app 2016-06-02 13:29:48 -05:00
Steven Silvester
bc001b8062 Remove the hardcoded jupyterlab in favor of a server extension 2016-06-02 13:14:05 -05:00
Safia Abdalla
5d0790c7dc Merge pull request #1503 from minrk/nb-secret-docs
remove discussion of IPython profiles from notebook signatures docs
2016-06-01 04:24:57 -05:00
Min RK
12d5189e95 remove discussion of IPython profiles from notebook signatures docs 2016-06-01 11:01:48 +02:00
Min RK
300fef8e96 Merge pull request #1471 from minrk/reconnect
Fixes for reconnecting on a flaky network
2016-05-30 11:00:29 +02:00
Thomas Kluyver
6dcfc4d352 Merge pull request #1497 from minrk/finish-rename
finish-up os.replace PR
2016-05-27 18:05:09 +01:00
Min RK
8c9e0c3ca3 finish-up os.replace PR
addresses last bit of review in #1370

- remove error-catching around os.replace
- move windows-specific handling to remove_file
2016-05-27 13:18:53 +02:00
Min RK
d1cbdc822f Merge pull request #1370 from varmas/use-os-replace
use os.replace instead of os.rename if available
2016-05-27 13:17:19 +02:00
Min RK
b6e8a3732e Allow replacing stale websocket connections
instead of refusing duplecate connections,
since reconnect on flaky network is more likely.
2016-05-27 13:00:28 +02:00
Min RK
6c4687bc8e remove outdated "you will NOT be able to run code" message
from connection-failed dialog.
This is a reference to ignored execute requests,
which are fixed by the pending-message queue.
2016-05-27 13:00:28 +02:00
Min RK
4fe10b8142 Prevent session_id collisions
Keep a registry of open sessions, and refuse to open duplicates.
2016-05-27 13:00:28 +02:00
Min RK
e110914495 register callbacks before sending message
just in case of infinitely fast replies
2016-05-27 13:00:28 +02:00
Min RK
14e276c6f1 allow explicit reconnect
rather than reconnect being a no-op if it appears connected

this allows an escape hatch if the connection should be forcefully reestablished.
2016-05-27 13:00:28 +02:00
Matthias Bussonnier
20ad0d03ee Merge pull request #1476 from minrk/backoff-codecov
Don't require patch coverage for CI
2016-05-26 18:17:27 -07:00
Matthias Bussonnier
45fec0e62e Merge pull request #1494 from dhirschfeld/fix-quotes
Fix quoting in `package.json`
2016-05-26 18:11:11 -07:00
Dave Hirschfeld
34203fa00f Fix quoting in package.json 2016-05-27 10:30:36 +10:00
Steven Silvester
523756a491 Fix handling of default cm modes 2016-05-25 20:20:40 -05:00
Steven Silvester
01ffff73dd Unify the codemirror imports 2016-05-25 08:31:34 -05:00
Min RK
a5ad979e6d Don't require patch coverage for CI
Keep it running so the number is visible, but don't use it as a CI criterion.
2016-05-22 22:33:48 +02:00
Min RK
4e359c921f Merge pull request #1466 from robnagler/robnagler-terminado_settings
added terminado_settings
2016-05-20 12:20:18 +02:00
Justin Tyberg
61730bd6de Add "--allow-root".
(c) Copyright IBM Corp. 2015
2016-05-18 22:05:59 -04:00
Justin Tyberg
7002b18dcb Allow root user to run tests.
(c) Copyright IBM Corp. 2015
2016-05-18 22:05:19 -04:00
Min RK
f8211ee016 Merge pull request #1458 from robnagler/robnagler-typeahead_min
typeahead.min.js (not typeahead.js)
2016-05-18 11:08:38 +02:00
Thomas Kluyver
49a4c7356d Merge pull request #1418 from minrk/nbconvert-exception
log exceptions in nbconvert handlers
2016-05-18 09:18:13 +01:00
Min RK
17af0c362c Merge pull request #1459 from robnagler/robnagler-edit_mimetype
EDIT_MIMETYPES needed "this." and corrected boolean logic on editing
2016-05-18 09:54:36 +02:00
robnagler
129c7179fc typeahead.min.js (not typeahead.js 2016-05-16 19:02:21 +00:00
robnagler
a92f38439f EDIT_MIMETYPES needed "this." and corrected boolean logic on editing 2016-05-16 19:00:38 +00:00
robnagler
385773d2c1 added terminado_settings 2016-05-13 19:21:20 +00:00
Thomas Kluyver
a7da78127a Merge pull request #1441 from minrk/mathjax-config
remove unnecessary _mathjax_config_default
2016-05-11 16:21:01 +01:00
Min RK
13575ea376 remove unnecessary _mathjax_config_default 2016-05-11 14:29:56 +02:00
Min RK
0f2193cc4c Merge pull request #1409 from poke1024/mathjax
Configurable MathJax config
2016-05-11 14:29:01 +02:00
Kyle Kelley
4ec76aa7b7 Merge pull request #1436 from minrk/less-py-js-py-js-less
add npm run build:css
2016-05-08 11:03:22 -05:00