Commit Graph

1677 Commits

Author SHA1 Message Date
MinRK
f677571f61 don't give up on weird os names
like java

closes #3113
2013-03-30 11:51:32 -07:00
Matthias Bussonnier
7bc51fd945 Merge pull request #3078 from minrk/link_re
fix regular expression for detecting links in stdout
2013-03-27 12:20:38 -07:00
Matthias Bussonnier
98aba52c58 Merge pull request #3054 from minrk/auto-cluster-size
restore default behavior for automatic cluster size
2013-03-27 12:03:10 -07:00
MinRK
4cd0d6e7bb fix regular expression for detecting links in stdout
The previous expression was matching both the beginning and the end of the line,
which would end up swallowing the next match,
ultimately matching every other URL in the string.

This removes the end-of-line check, so it will match every URL.

The wrapURLs function to make URLs easier to identify does not seem to have been necessary,
and has thus been removed.

closes #2834
2013-03-25 16:56:05 -07:00
Matthias Bussonnier
8389e79fac Merge pull request #3076 from dwyde/improve-notebook-js-yuidoc
Improve notebook.js documentation
2013-03-25 12:59:50 -07:00
David Wyde
7a10342d6f Add YUIDoc in notebook.js. 2013-03-25 12:42:41 -05:00
Paul Ivanov
0e7aeb29f2 Merge pull request #3075 from ivanov/sigusr1-windows
check for SIGUSR1 before using it, closes #3074
2013-03-25 08:45:49 -07:00
Paul Ivanov
9ca886dc11 check for SIGUSR1 before using it, closes #3074
thanks @takluyver for spotting this
2013-03-25 08:30:31 -07:00
Min RK
b218a55a5d Merge pull request #3051 from minrk/vbox-ff-fail
add width:100% to vbox for webkit / FF consistency

closes #3049
2013-03-24 19:37:29 -07:00
Min RK
d4c6bef1f5 Merge pull request #3033 from ivanov/print-server-info
on resume, print server info again
2013-03-24 11:19:53 -07:00
Paul Ivanov
6334a481b2 print info string on interrupt, log it on startup 2013-03-24 10:53:59 -07:00
MinRK
276d8b68bb restore default behavior for automatic cluster size
the up/down buttons still work, but it doesn't populate everything with 2,
which was wrong.
2013-03-22 10:54:36 -07:00
MinRK
7fcc683e6f add width:100% to vbox for webkit / FF consistency
closes #3049
2013-03-21 12:21:49 -07:00
Paul Ivanov
fd467e75b6 make SIGUSR1 and SIGINFO trigger printing of info
Directory and url/port information for the notebook server is now
printed when it receives one of these signals. SIGINFO is available only
on BSD-based systems, and is triggered via Ctrl-T.
2013-03-18 18:09:28 -07:00
Paul Ivanov
218087104d log the notebook server directory
suggestion provided by @Carreau
2013-03-18 15:39:45 -07:00
Min RK
63bb914670 Merge pull request #3032 from olivierverdier/dateformat
fix time format to international time format
2013-03-18 14:17:05 -07:00
Paul Ivanov
786396cbb0 on resume, print server info again
This commit makes it possible to differentiate between many different
long-running notebook servers, where the original ip address and port
information printed at the beginning has scrolled out of the screen.

We save the server location string that gets printed on startup, and
re-print it when the user attempts to interrupt the server with Ctrl-C

Thanks to @minrk for discussion on how this should work.

Also added a docstring to the start() method
2013-03-18 13:53:40 -07:00
Olivier Verdier
a7a73c4285 fix time format to international time format
use the ISO 8601 standard
see http://en.wikipedia.org/wiki/ISO_8601#Times
2013-03-18 16:21:22 +01:00
Min RK
903595a2a1 Merge pull request #3024 from morenoh149/fixalttext
changed instances of 'outout' to 'output' in alt texts
2013-03-15 21:09:40 -07:00
Harry Moreno
21fc8cd23b changed instances of 'outout' to 'output' in alt text's 2013-03-15 15:56:58 -07:00
Min RK
894f53a5bf Merge pull request #2987 from minrk/localfiles
fix local files examples in markdown
2013-03-10 16:13:52 -07:00
Min RK
8d85554bd7 Merge pull request #2998 from Carreau/fix-css
fix css in .output_area pre
2013-03-10 16:13:39 -07:00
Matthias BUSSONNIER
3b37cd80e4 fix css in .output_area pre
font: inherit conflict with monospace, wich in some cases
leads to non-monospace font (nbviewer for example)
2013-03-05 21:03:27 +01:00
MinRK
37d277c77d fix local files examples in markdown 2013-02-27 12:15:21 -08:00
Min RK
abb31c2d3a Merge pull request #2983 from Carreau/fix-run-all
fix run-all (that-> this)
2013-02-25 16:06:23 -08:00
Matthias BUSSONNIER
f84acbbaff fix run-all (that-> this) 2013-02-25 23:19:42 +01:00
Brian E. Granger
4843a7acd2 Merge pull request #2942 from Carreau/cm-ipython-css
Move CM IPython theme out of codemirror folder
2013-02-22 09:32:41 -08:00
Brian E. Granger
66049a99f0 Merge pull request #2929 from Carreau/cleanup-cell-insertion
Cleanup cell insertion
2013-02-22 09:24:08 -08:00
Brian E. Granger
b766ab9d3c Merge pull request #2968 from Carreau/fixdel
fix notebook deletion.
2013-02-22 09:00:26 -08:00
Matthias BUSSONNIER
914dfb9f61 fix one more == to === 2013-02-22 13:08:56 +01:00
Matthias BUSSONNIER
10e92b3034 fix i/index in move up/down and == -> === 2013-02-22 13:07:16 +01:00
Matthias BUSSONNIER
0033b3e6c5 fix notebook deletion.
do not thrust what "that" is in a 3 level deep
callback
2013-02-22 09:56:33 +01:00
Brian E. Granger
dbbe6f4ee1 Merge pull request #2954 from minrk/fixdynamic
fix logic for append_javascript
2013-02-20 11:35:16 -08:00
MinRK
acf3b2bf21 fix logic for append_javascript
PR #2911 results in appending javascript even if dynamic is false,
so in current master all javascript outputs are actually run at load.
2013-02-19 13:59:37 -08:00
Matthias BUSSONNIER
e4cbf5e717 move CM IPython theme out of codemirror folder 2013-02-16 19:21:27 +01:00
Bussonnier Matthias
051dc7725e Merge pull request #2941 from Carreau/fix-baseprojectclosure
fix baseUrl

Fix closure on baseproject URL due to merge of #2897, 
merging immediately as it makes some menu item unusable.
2013-02-16 08:44:27 -08:00
Matthias BUSSONNIER
6ed926be7b fix baseUrl 2013-02-16 17:43:14 +01:00
Bussonnier Matthias
9cd9e5db73 Merge pull request #2903 from Carreau/toggle-line-number
Specify toggle value on cell line number
2013-02-16 07:20:55 -08:00
Bussonnier Matthias
a1a32e82ff Merge pull request #2911 from Carreau/output-order-conf
display order in output area configurable
2013-02-16 07:11:32 -08:00
Bussonnier Matthias
f99f0571d7 Merge pull request #2897 from Carreau/baseurl-meth
Dont rely on BaseProjectUrl data in body tag
2013-02-16 07:10:10 -08:00
Bussonnier Matthias
0a25fb8749 Merge pull request #2894 from Carreau/cm-configurable
Cm configurable
2013-02-16 07:09:31 -08:00
Matthias BUSSONNIER
f6298c6c7f use show method in toggle method 2013-02-16 11:59:26 +01:00
Matthias BUSSONNIER
1f402a1dac remove unused/not working function 2013-02-16 11:47:31 +01:00
Matthias BUSSONNIER
e965757a33 simplify logic 2013-02-16 11:44:13 +01:00
Bussonnier Matthias
b8fe73ba3c Merge pull request #2932 from takluyver/get-static-files
Simplify using notebook static files from external code
2013-02-14 23:54:24 -08:00
Thomas Kluyver
9e2894caa2 Simplify using notebook static files from external code. 2013-02-14 16:52:54 +00:00
Bussonnier Matthias
1467f5b59f abstract, cleanup and document
Separate the methods that actually insert dom element for easier
testing.

Cleanup, and order methods more logically

add "docstring"
2013-02-13 22:35:42 +01:00
Bussonnier Matthias
0c5c5b9c83 Merge pull request #2906 from Carreau/mkypatch-cm
Unpatch/Monkey patch CM
2013-02-13 13:00:45 -08:00
Bussonnier Matthias
a6ec75a96b Merge pull request #2921 from minrk/undo-cell-menu
add menu item for undo delete cell
2013-02-13 12:57:20 -08:00
Matthias BUSSONNIER
44385d9c7f jslint 2013-02-12 23:13:09 +01:00