Min RK
c9961b44b6
Merge pull request #6000 from AlbertHilb/FloatWidgetValueFix
...
Validate initial value of "_BoundedFloatWidget".
2014-06-21 13:20:57 -05:00
Thomas Kluyver
3b92c7c24f
Merge pull request #6011 from minrk/no-jsonapi
...
only use zmq.jsonapi when talking to zmq sockets
2014-06-18 14:45:31 -07:00
Min RK
99f52dee68
Merge pull request #5827 from takluyver/kernelspec-rest-api
...
Kernel specs REST API
2014-06-18 13:53:41 -07:00
MinRK
44d2a5b62a
only use zmq.jsonapi when talking to zmq sockets
...
use stdlib json otherwise
2014-06-18 13:41:40 -07:00
Thomas Kluyver
ebf0ea32ef
Use stdlib json, not zmq jsonapi
2014-06-18 12:51:41 -07:00
Min RK
878768a8ae
Merge pull request #6003 from stevenmanton/master
...
Set kernel_id before checking websocket
2014-06-17 12:50:06 -07:00
Steven Anton
f937045395
Set kernel_id before checking websocket
...
If websocket attempt fails and cross origin attempt is detected, a HTTPError(404) error is raised. However, in the process of closing connections because of this 404 error, an unhandled Attribute exception (kernel_id not an attribute) is raised. Setting the kernel_id first avoids this.
2014-06-17 12:29:55 -07:00
Raffaele De Feo
694f33e2ba
Validate initial value of "_BoundedFloatWidget".
2014-06-17 15:02:28 +02:00
Thomas Kluyver
85ce34bc66
Kernel resource handlers now require authenticated user
2014-06-16 15:24:30 -07:00
Min RK
8c60671cb8
Merge pull request #5975 from Carreau/simple-styling
...
inherit style instead of duplicating it
2014-06-13 16:58:10 -07:00
Matthias BUSSONNIER
7128ff5148
add instruction to pin lessc
2014-06-13 21:56:39 +02:00
Matthias BUSSONNIER
fd4dd9246e
inherit style instead of duplicating it
2014-06-13 21:56:39 +02:00
Thomas Kluyver
a942db896c
Merge pull request #5972 from takluyver/js-tests-xunit
...
Add Xunit support for JS tests
2014-06-11 09:49:39 -07:00
Thomas Kluyver
19f0362bb5
Add Xunit support for JS tests
...
Casper supports producing xunit output. WIth this, our --xunit flag gets
passed down to the JS test process. This should give nicer output for
JS test failures on Jenkins.
2014-06-11 09:30:27 -07:00
Brian E. Granger
deb32ade89
Merge pull request #5974 from jdfreder/emergency
...
Emergency JS tests fix
2014-06-11 09:00:11 -07:00
Jonathan Frederic
63f136af2b
Fixed test to reflect new Bootstrap3 toggle button behavior.
2014-06-10 17:32:17 -07:00
Jonathan Frederic
22812d36b3
Use waits instead of sleeps.
2014-06-10 17:23:21 -07:00
Jonathan Frederic
5acb525c43
Wait for keyboard help fadein and fadeout.
2014-06-10 16:36:02 -07:00
Thomas Kluyver
7623437b61
Merge pull request #5971 from takluyver/jsonschema-test-dep
...
Allow tests to run without jsonschema
2014-06-10 15:47:14 -07:00
Thomas Kluyver
556257a66b
Fix bootstrap location in package_data
2014-06-10 13:00:47 -07:00
Thomas Kluyver
d39cf0e927
Add jsonschema & jsonpointer requirements for JS tests
2014-06-10 12:38:46 -07:00
Thomas Kluyver
38d1f3dbc5
nbformat also requires jsonpointer
2014-06-10 12:37:45 -07:00
Thomas Kluyver
e0e91460c8
Require jsonschema for nbformat, html and nbconvert tests
2014-06-10 12:11:16 -07:00
Thomas Kluyver
37e4ef83b1
Move strip_ansi function to utils
2014-06-10 12:05:46 -07:00
Brian E. Granger
eab07229ef
Merge pull request #5617 from jdfreder/bootstrap3
...
Migrate from Bootstrap 2 to Bootstrap 3
2014-06-10 10:51:50 -07:00
Jonathan Frederic
dba9a04f27
Removed block commented tour step (never worked anyways)
2014-06-10 10:50:34 -07:00
Jonathan Frederic
e31fa6cf2c
Fix bootstrap tour
2014-06-10 10:14:14 -07:00
Jonathan Frederic
99b1747c60
Bootstrap Tour related fixes
2014-06-09 17:46:20 -07:00
Jonathan Frederic
bccb7ddaea
Fab CSS
2014-06-09 16:14:07 -07:00
Jonathan Frederic
ea29056e7c
Review #2
2014-06-09 16:13:59 -07:00
Thomas Kluyver
82e2ea7e47
Merge pull request #5323 from jdfreder/slimerjs
...
Add support for Firefox JS testing
2014-06-09 15:02:14 -07:00
Min RK
a4f264ed47
Merge pull request #5733 from jhamrick/nbformat-v4-schema
...
nbformat v4 draft schema
2014-06-09 14:53:48 -07:00
Jonathan Frederic
63350a4d54
Fab CSS
2014-06-09 12:13:31 -07:00
Jonathan Frederic
1224af6028
Fixed cell toolbar select font size
2014-06-09 12:13:21 -07:00
Jonathan Frederic
cd289b6bdf
Fab CSS
2014-06-09 12:06:29 -07:00
Jonathan Frederic
83eee97e95
Review comments
2014-06-09 12:05:40 -07:00
Jonathan Frederic
3bb8c472cd
Modal fixes for BS3
2014-06-09 12:05:40 -07:00
Jonathan Frederic
4917aba5e4
Fab CSS
2014-06-09 12:05:40 -07:00
Jonathan Frederic
2d8afab3d4
Fix widget widths for Bootstrap3
2014-06-09 12:05:40 -07:00
Jonathan Frederic
33f7f4457f
Widget bootstrap3 fixes
2014-06-09 12:05:39 -07:00
Jonathan Frederic
29de556b94
Fab CSS
2014-06-09 12:05:39 -07:00
Jonathan Frederic
8fd3515794
Post discussion with @ellisonbg
2014-06-09 12:05:39 -07:00
Jonathan Frederic
ceff3db0a2
Fab CSS
2014-06-09 12:05:39 -07:00
Jonathan Frederic
616bdcee81
Make maintoolbar select dropdowns look nice
2014-06-09 12:05:39 -07:00
Jonathan Frederic
32c7aea922
Fab CSS
2014-06-09 12:05:39 -07:00
Jonathan Frederic
73f68f9b93
Revert 2em notebook header space
2014-06-09 12:05:39 -07:00
Jonathan Frederic
5584eb06a9
Fab CSS
2014-06-09 12:05:39 -07:00
Jonathan Frederic
45ebf12371
Left align "File" instead of menu edge.
2014-06-09 12:05:39 -07:00
Jonathan Frederic
6834cb95bc
Rebase cleanup, comments and nesting
2014-06-09 12:05:39 -07:00
Jonathan Frederic
dec962194f
Update components to point to right branch
2014-06-09 12:05:39 -07:00