[sagenb] 86/157: Merge branch 'master' into new_jmol

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit c2d2b7ab71b63ca009b67ca73fea7ce0a3592ee7
Merge: 5f850ed ece3ebf
Author: Volker Braun <vbraun.name at gmail.com>
Date:   Mon Oct 6 11:47:35 2014 +0100

    Merge branch 'master' into new_jmol
    
    Conflicts:
    	Changes

 Changes                                            |   53 +
 HACKING.rst                                        |   24 +-
 MANIFEST.in                                        |    1 -
 sagenb/data/sage/html/login.html                   |    2 +-
 sagenb/data/sage/html/notebook/base.html           |    2 +-
 sagenb/data/sage/html/notebook/worksheet_page.html |    2 +
 sagenb/data/sage/html/settings/admin_add_user.html |   15 +-
 sagenb/data/sage/html/upload.html                  |   37 +-
 sagenb/data/sage/js/mathjax_sage.js                |    5 +-
 sagenb/flask_version                               |    1 -
 .../flask_version}/__init__.py                     |    0
 {flask_version => sagenb/flask_version}/admin.py   |   11 +-
 .../flask_version}/authentication.py               |    2 +-
 {flask_version => sagenb/flask_version}/base.py    |    3 +-
 .../flask_version}/decorators.py                   |    0
 {flask_version => sagenb/flask_version}/doc.py     |    0
 .../flask_version}/nodoctest.py                    |    0
 .../flask_version}/settings.py                     |   14 +-
 .../flask_version}/worksheet.py                    |    0
 .../flask_version}/worksheet_listing.py            |    3 +-
 sagenb/message.pot                                 |    4 +-
 sagenb/misc/sphinxify.py                           |    6 +-
 sagenb/misc/support.py                             |    3 +-
 sagenb/notebook/cell.py                            |   16 +-
 sagenb/notebook/interact.py                        |   26 +-
 sagenb/notebook/run_notebook.py                    |    9 +
 sagenb/notebook/tutorial.py                        |    2 +-
 sagenb/notebook/user_manager.py                    |   22 +
 sagenb/translations/cs_CZ/LC_MESSAGES/messages.mo  |  Bin 51440 -> 53716 bytes
 sagenb/translations/cs_CZ/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/de_AT/LC_MESSAGES/messages.mo  |  Bin 53956 -> 57053 bytes
 sagenb/translations/de_AT/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/en_US/LC_MESSAGES/messages.mo  |  Bin 0 -> 839 bytes
 sagenb/translations/en_US/LC_MESSAGES/messages.po  |   41 +
 sagenb/translations/es_ES/LC_MESSAGES/messages.mo  |  Bin 0 -> 57962 bytes
 .../es_ES/LC_MESSAGES/messages.po}                 | 1213 +++++++++++++-------
 sagenb/translations/fr_FR/LC_MESSAGES/messages.mo  |  Bin 56793 -> 57111 bytes
 sagenb/translations/fr_FR/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/pt_BR/LC_MESSAGES/messages.mo  |  Bin 51626 -> 54347 bytes
 sagenb/translations/pt_BR/LC_MESSAGES/messages.po  |   21 +
 sagenb/translations/ru_RU/LC_MESSAGES/messages.mo  |  Bin 71164 -> 74453 bytes
 sagenb/translations/ru_RU/LC_MESSAGES/messages.po  |   87 +-
 setup.py                                           |    2 +-
 43 files changed, 1144 insertions(+), 546 deletions(-)

diff --cc sagenb/notebook/cell.py
index f50ec10,600539d..5acd1e7
mode 100755,100644..100755
--- a/sagenb/notebook/cell.py
+++ b/sagenb/notebook/cell.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git