Commit Graph

11182 Commits

Author SHA1 Message Date
Maxim Vov
03e5dc00e1 Moved the 'metrics' file to a new package named 'promethues'.
Then split the file into two files, one containing the metrics themselves, the other containing any function that have something to do with prometheus.

Finally, Added new metrics into the prometheus.metrics file that represent the number of running terminals and added the functionality for that metric to be recorded in the terminal.api_handlers file.
2018-09-26 17:15:40 +03:00
Min RK
d772277c0b
Merge pull request #3949 from gustavoefeiche/fix-installation
Fix installation script
2018-09-20 09:30:47 +02:00
Gustavo Efeiche
26c73d36d0 Fix issue #3948 2018-09-20 00:18:16 -03:00
Gustavo Efeiche
a8716eb9ac Fix versions mismatch in namespace.js and _version.py 2018-09-20 00:16:42 -03:00
Gustavo Efeiche
e661c7642d Change from 6.0.0dev0 to 6.0.0.dev0 2018-09-20 00:15:58 -03:00
Min RK
b7fdc41ff6 back to dev 2018-09-19 16:37:13 +02:00
Min RK
775cb20de3 minor typos in changelog for 5.7 2018-09-19 16:35:51 +02:00
Min RK
7acb4e047d release 5.7.0 2018-09-19 16:31:30 +02:00
Min RK
5b115c2e90
Merge pull request #3931 from minrk/translate-sdists
include translation sources in sdists
2018-09-19 16:28:24 +02:00
Min RK
ba7aadbf7a note translation inclusions in sdists 2018-09-19 14:57:47 +02:00
Min RK
bb8f63baca include translation sources in sdists 2018-09-18 13:45:33 +02:00
Min RK
33ec6440f8
Merge pull request #3925 from Carreau/package-translations
Try rebuild translation js
2018-09-18 13:37:25 +02:00
Min RK
e78f438e5a invoke setup.py build on appveyor
for better output
2018-09-17 10:34:48 +02:00
Min RK
52ca0d64ca fix installation, invocation of po2json
- no global installation
- invoke with node
2018-09-17 10:33:22 +02:00
Matthias Bussonnier
07126ca8a5 one more try 2018-09-16 18:28:33 +02:00
Matthias Bussonnier
d239839e07 Build js translation at build time.
Make sure they are included in sdist/wheel.
2018-09-16 11:55:22 +02:00
Matthias Bussonnier
bb07253ff4
Merge pull request #3888 from JocelynDelalande/jd-french-i18n
Add French translation
2018-09-15 20:00:24 +02:00
Jocelyn Delalande
05f9488232 Fix misc French wordings 2018-09-15 18:12:59 +02:00
Jocelyn Delalande
e1494bb8f8 Rework French wording "Brute NBConvert" → « Texte Brut (pour NBConvert)" 2018-09-15 18:12:59 +02:00
Jocelyn Delalande
db8b03e434 Rework French wording au-dessus/au-dessous → précédent/suivant 2018-09-15 18:12:59 +02:00
Jocelyn Delalande
5a1b35fe13 Fix trailing spaces in translations
Move them from translation strings to static HTML part.
2018-09-15 18:04:58 +02:00
Matthias Bussonnier
c9cd79b261
Merge pull request #3915 from minrk/rel-5.7
prepare changelog for 5.7
2018-09-14 11:26:19 +02:00
Matthias Bussonnier
8b74d6dea4
Merge pull request #3913 from minrk/fix-prompt-alignment
fix uneven input/output prompt alignment
2018-09-14 11:25:15 +02:00
Matthias Bussonnier
f6f9bab9a9
Merge pull request #3914 from minrk/requirejs-22
bump requirejs to 2.2
2018-09-14 11:23:34 +02:00
Min RK
4f70dd06af changelog for 5.7 2018-09-13 17:25:20 +02:00
Min RK
37b35dc65f fix uneven input/output prompt alignment 2018-09-13 16:54:35 +02:00
Min RK
86e473e754
Merge pull request #3839 from AestheticIntegration/fix-output-prompt-width
Return output prompt to width of input prompt after #3772
2018-09-13 16:53:56 +02:00
Min RK
8ced0dd367
Merge pull request #3907 from kevin-bates/prevent-AttributeError-on-shutdown
Prevent access through 'NoneType' when closing activity_stream
2018-09-13 16:52:50 +02:00
Min RK
026d5f1a05 bump requirejs to 2.2 2018-09-13 16:37:52 +02:00
Min RK
f81ec30b62
Merge pull request #3829 from mociarain/fix-tornado-settings
Fix tornado max_body_size & max_buffer_size settings
2018-09-13 16:36:54 +02:00
Min RK
0da9648ed3
Merge pull request #3905 from KGHustad/breadcrumb-root-url-fix
Prefix base URL to breadcrumb root URL
2018-09-13 16:23:42 +02:00
Min RK
4650dabd05
Merge pull request #3871 from parente/fix/shortcut-editor-enter
Fix Enter causes page reload in shortcuts editor
2018-09-13 16:23:00 +02:00
Min RK
9c60369a17
Merge pull request #3836 from cmd-ntrf/jqueryui
Update to jQuery UI 1.12
2018-09-13 16:22:44 +02:00
Min RK
bee2c389ca
Merge pull request #3883 from moble/public_server_csp
Describe problems and solutions involving CSP headers
2018-09-13 16:22:14 +02:00
Min RK
075acdff80
Merge pull request #3908 from MichaelChirico/patch-1
remove vestigial lines from documentation
2018-09-13 16:19:24 +02:00
Michael Chirico
ffb486453f
remove vestigial lines from documentation
Found here:
2018-09-12 17:37:14 +08:00
Kevin Bates
2d688f2071 Prevent access through 'NoneType' when closing activity_stream
Although I'm unable to reproduce the issue, its a safe change to
prevent an AttributeError from occuring ('NoneType' object has no
attribute 'close').  The user that reported this is attempting to
launch a kernel and I believe the launch only partially completed
such that `kernel._activity_stream` did not get established.
(This occurred from Jupyter Enterprise Gateway where we deal with remote
kernel launches across resource-managed clusters, so things are a bit
more involved relative to kernel establishment.)
2018-09-11 11:08:57 -07:00
Kristian Gregorius Hustad
076acf6a98 Prefix base URL to breadcrumb root URL
The base URL was only prefixed to the breadcrumbs following the root.
See https://github.com/jupyterhub/jupyterhub/issues/2137 for problem
description.
2018-09-10 23:41:38 +02:00
Min RK
872a6c7b9b
Merge pull request #3886 from rwmajor2/add_access_control_hdr_config
Allow access control headers to be overriden in jupyter_notebook_conf…
2018-09-07 17:25:57 +02:00
Min RK
0abc8220a0
Merge pull request #3816 from Kilo59/master
Fix f string syntax highlighting
2018-09-07 17:25:14 +02:00
Min RK
6c0ee1ba12
Merge pull request #3879 from starcruiseromega/exporters
Get the list of exporters from entrypoints
2018-09-07 17:24:57 +02:00
Jocelyn Delalande
cc97e8fe90 French translation: reword "point de sauvegarde" → "sauvegarde"
- Improves understanding (French contains « Sauvegarder » and « Enregistrer »,
which have different meaning, let's take advantage of that).
- Fix layout (too long sentences were breaking CSS layout in some cases)
2018-08-30 16:26:34 +02:00
Jocelyn Delalande
6ee41dadc4 Add French translation
100% of current .pot strings are translated
2018-08-29 19:20:55 +02:00
Bill Major
cc5e08d1bc Allow access control headers to be overriden in jupyter_notebook_config.py 2018-08-28 15:42:15 -04:00
Michael Boyle
88d5fc8e5f
Describe problems and solutions involving CSP headers 2018-08-27 12:37:57 -04:00
Sally Wilsak
c258d3fa79 Get the list of exporters from entrypoints
`exporter_map` is deprecated, so let's use the list of exporters fetched
from the installed entrypoints.

There's a supposed attribute `export_from_notebook` that should be set
to a friendly string name if the exporter should be exposed in the
front-end. However, the exporters defined in `nbconvert` don't have it
set, so I haven't used it to determine inclusion in the list. Instead,
I've used the entrypoint name as the friendly name, which looks like it
was the intention from the way they are named.

I ran the unit tests and tried starting up the notebook server and
accessing the API endpoint to verify the JSON looked correct.
2018-08-25 15:47:51 -04:00
Peter Parente
109b39e2b6 Prevent page reload on Enter 2018-08-21 21:25:49 -04:00
Steven Silvester
98085dcb84
Merge pull request #3744 from PraneetMokkapati/master
Disabled Tags and Slide Types for non editable cells
2018-08-13 06:22:32 -05:00
Steven Silvester
34baae5678
Merge pull request #3759 from minrk/flush-iopub
flush iopub before sending restarting/dead status messages
2018-08-13 06:21:19 -05:00
Steven Silvester
eed1caf32a
Merge pull request #3809 from minrk/ipaddress-unicode-py2
ip_address only accepts unicode on Python 2
2018-08-13 06:20:54 -05:00