From b6dee24cff14e77583db761f36f458bb4301778f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 19 Nov 2019 16:58:28 -0800 Subject: [PATCH] Revert "Add a jupyter server extension to render desktop/" Removes the server extension, so the HTML for the interface *is* served by websockify itself. This is a fix for https://github.com/yuvipanda/jupyter-desktop-server/issues/10 This reverts commit 18d7fb7b2a123bb1ffeb080472805efcc6ff4fc1. --- MANIFEST.in | 4 +-- .../__init__.py | 25 +++++------------- .../share/tigervnc/bin/Xvnc | Bin .../share/tigervnc/bin/vncconfig | Bin .../share/tigervnc/bin/vncpasswd | Bin .../share/tigervnc/bin/vncserver | 0 .../share/tigervnc/bin/vncviewer | Bin .../share/tigervnc/bin/x0vncserver | Bin .../share/tigervnc/lib64/swrast_dri.so | Bin .../share/tigervnc/lib64/xorg/protocol.txt | 0 .../share/applications/vncviewer.desktop | 0 .../share/doc/tigervnc-1.9.0/LICENCE.TXT | 0 .../share/doc/tigervnc-1.9.0/README.rst | 0 .../icons/hicolor/16x16/apps/tigervnc.png | Bin .../icons/hicolor/22x22/apps/tigervnc.png | Bin .../icons/hicolor/24x24/apps/tigervnc.png | Bin .../icons/hicolor/32x32/apps/tigervnc.png | Bin .../icons/hicolor/48x48/apps/tigervnc.png | Bin .../icons/hicolor/scalable/apps/tigervnc.svg | 0 .../share/locale/bg/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/cs/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/da/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/de/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/el/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/eo/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/es/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/fi/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/fr/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/fur/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/hu/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/id/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/it/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/nl/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/pl/LC_MESSAGES/tigervnc.mo | Bin .../locale/pt_BR/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/ru/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/sk/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/sr/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/sv/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/tr/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/uk/LC_MESSAGES/tigervnc.mo | Bin .../share/locale/vi/LC_MESSAGES/tigervnc.mo | Bin .../locale/zh_CN/LC_MESSAGES/tigervnc.mo | Bin .../share/tigervnc/share/man/man1/Xvnc.1 | 0 .../share/tigervnc/share/man/man1/vncconfig.1 | 0 .../share/tigervnc/share/man/man1/vncpasswd.1 | 0 .../share/tigervnc/share/man/man1/vncserver.1 | 0 .../share/tigervnc/share/man/man1/vncviewer.1 | 0 .../tigervnc/share/man/man1/x0vncserver.1 | 0 .../share/usr/local/share/vnc/classes/README | 0 .../usr/local/share/vnc/classes/VncViewer.jar | Bin .../usr/local/share/vnc/classes/favicon.ico | Bin .../usr/local/share/vnc/classes/index.vnc | 0 .../share/web/noVNC-1.1.0/.eslintignore | 0 .../share/web/noVNC-1.1.0/.eslintrc | 0 .../.github/ISSUE_TEMPLATE/bug_report.md | 0 .../.github/ISSUE_TEMPLATE/feature_request.md | 0 .../share/web/noVNC-1.1.0/.gitignore | 0 .../share/web/noVNC-1.1.0/.gitmodules | 0 .../share/web/noVNC-1.1.0/.travis.yml | 0 .../share/web/noVNC-1.1.0/AUTHORS | 0 .../share/web/noVNC-1.1.0/LICENSE.txt | 0 .../share/web/noVNC-1.1.0/README.md | 0 .../share/web/noVNC-1.1.0/VERSION | 0 .../web/noVNC-1.1.0/app/error-handler.js | 0 .../share/web/noVNC-1.1.0/app/images/alt.svg | 0 .../web/noVNC-1.1.0/app/images/clipboard.svg | 0 .../web/noVNC-1.1.0/app/images/connect.svg | 0 .../share/web/noVNC-1.1.0/app/images/ctrl.svg | 0 .../web/noVNC-1.1.0/app/images/ctrlaltdel.svg | 0 .../web/noVNC-1.1.0/app/images/disconnect.svg | 0 .../share/web/noVNC-1.1.0/app/images/drag.svg | 0 .../web/noVNC-1.1.0/app/images/error.svg | 0 .../share/web/noVNC-1.1.0/app/images/esc.svg | 0 .../web/noVNC-1.1.0/app/images/expander.svg | 0 .../web/noVNC-1.1.0/app/images/fullscreen.svg | 0 .../web/noVNC-1.1.0/app/images/handle.svg | 0 .../web/noVNC-1.1.0/app/images/handle_bg.svg | 0 .../web/noVNC-1.1.0/app/images/icons/Makefile | 0 .../app/images/icons/novnc-120x120.png | Bin .../app/images/icons/novnc-144x144.png | Bin .../app/images/icons/novnc-152x152.png | Bin .../app/images/icons/novnc-16x16.png | Bin .../app/images/icons/novnc-192x192.png | Bin .../app/images/icons/novnc-24x24.png | Bin .../app/images/icons/novnc-32x32.png | Bin .../app/images/icons/novnc-48x48.png | Bin .../app/images/icons/novnc-60x60.png | Bin .../app/images/icons/novnc-64x64.png | Bin .../app/images/icons/novnc-72x72.png | Bin .../app/images/icons/novnc-76x76.png | Bin .../app/images/icons/novnc-96x96.png | Bin .../app/images/icons/novnc-icon-sm.svg | 0 .../app/images/icons/novnc-icon.svg | 0 .../share/web/noVNC-1.1.0/app/images/info.svg | 0 .../web/noVNC-1.1.0/app/images/keyboard.svg | 0 .../web/noVNC-1.1.0/app/images/mouse_left.svg | 0 .../noVNC-1.1.0/app/images/mouse_middle.svg | 0 .../web/noVNC-1.1.0/app/images/mouse_none.svg | 0 .../noVNC-1.1.0/app/images/mouse_right.svg | 0 .../web/noVNC-1.1.0/app/images/power.svg | 0 .../web/noVNC-1.1.0/app/images/settings.svg | 0 .../share/web/noVNC-1.1.0/app/images/tab.svg | 0 .../app/images/toggleextrakeys.svg | 0 .../web/noVNC-1.1.0/app/images/warning.svg | 0 .../web/noVNC-1.1.0/app/images/windows.svg | 0 .../share/web/noVNC-1.1.0/app/locale/cs.json | 0 .../share/web/noVNC-1.1.0/app/locale/de.json | 0 .../share/web/noVNC-1.1.0/app/locale/el.json | 0 .../share/web/noVNC-1.1.0/app/locale/es.json | 0 .../share/web/noVNC-1.1.0/app/locale/ko.json | 0 .../share/web/noVNC-1.1.0/app/locale/nl.json | 0 .../share/web/noVNC-1.1.0/app/locale/pl.json | 0 .../share/web/noVNC-1.1.0/app/locale/ru.json | 0 .../share/web/noVNC-1.1.0/app/locale/sv.json | 0 .../share/web/noVNC-1.1.0/app/locale/tr.json | 0 .../web/noVNC-1.1.0/app/locale/zh_CN.json | 0 .../web/noVNC-1.1.0/app/locale/zh_TW.json | 0 .../share/web/noVNC-1.1.0/app/localization.js | 0 .../share/web/noVNC-1.1.0/app/sounds/CREDITS | 0 .../share/web/noVNC-1.1.0/app/sounds/bell.mp3 | Bin .../share/web/noVNC-1.1.0/app/sounds/bell.oga | Bin .../noVNC-1.1.0/app/styles/Orbitron700.ttf | Bin .../noVNC-1.1.0/app/styles/Orbitron700.woff | Bin .../share/web/noVNC-1.1.0/app/styles/base.css | 0 .../share/web/noVNC-1.1.0/app/ui.js | 0 .../share/web/noVNC-1.1.0/app/webutil.js | 0 .../share/web/noVNC-1.1.0/core/base64.js | 0 .../web/noVNC-1.1.0/core/decoders/copyrect.js | 0 .../web/noVNC-1.1.0/core/decoders/hextile.js | 0 .../web/noVNC-1.1.0/core/decoders/raw.js | 0 .../web/noVNC-1.1.0/core/decoders/rre.js | 0 .../web/noVNC-1.1.0/core/decoders/tight.js | 0 .../web/noVNC-1.1.0/core/decoders/tightpng.js | 0 .../share/web/noVNC-1.1.0/core/des.js | 0 .../share/web/noVNC-1.1.0/core/display.js | 0 .../share/web/noVNC-1.1.0/core/encodings.js | 0 .../share/web/noVNC-1.1.0/core/inflator.js | 0 .../web/noVNC-1.1.0/core/input/domkeytable.js | 0 .../web/noVNC-1.1.0/core/input/fixedkeys.js | 0 .../web/noVNC-1.1.0/core/input/keyboard.js | 0 .../web/noVNC-1.1.0/core/input/keysym.js | 0 .../web/noVNC-1.1.0/core/input/keysymdef.js | 0 .../share/web/noVNC-1.1.0/core/input/mouse.js | 0 .../share/web/noVNC-1.1.0/core/input/util.js | 0 .../share/web/noVNC-1.1.0/core/input/vkeys.js | 0 .../web/noVNC-1.1.0/core/input/xtscancodes.js | 0 .../share/web/noVNC-1.1.0/core/rfb.js | 0 .../web/noVNC-1.1.0/core/util/browser.js | 0 .../share/web/noVNC-1.1.0/core/util/cursor.js | 0 .../share/web/noVNC-1.1.0/core/util/events.js | 0 .../web/noVNC-1.1.0/core/util/eventtarget.js | 0 .../web/noVNC-1.1.0/core/util/logging.js | 0 .../web/noVNC-1.1.0/core/util/polyfill.js | 0 .../web/noVNC-1.1.0/core/util/strings.js | 0 .../share/web/noVNC-1.1.0/core/websock.js | 0 .../web/noVNC-1.1.0/docs/API-internal.md | 0 .../share/web/noVNC-1.1.0/docs/API.md | 0 .../share/web/noVNC-1.1.0/docs/EMBEDDING.md | 0 .../share/web/noVNC-1.1.0/docs/LIBRARY.md | 0 .../web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause | 0 .../web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause | 0 .../web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 | 0 .../web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 | 0 .../web/noVNC-1.1.0/docs/flash_policy.txt | 0 .../share/web/noVNC-1.1.0/docs/links | 0 .../share/web/noVNC-1.1.0/docs/notes | 0 .../share/web/noVNC-1.1.0/docs/rfb_notes | 0 .../web/noVNC-1.1.0/docs/rfbproto-3.3.pdf | Bin .../web/noVNC-1.1.0/docs/rfbproto-3.7.pdf | Bin .../web/noVNC-1.1.0/docs/rfbproto-3.8.pdf | Bin .../share/web/noVNC-1.1.0/karma.conf.js | 0 .../share/web/noVNC-1.1.0/package.json | 0 .../share/web/noVNC-1.1.0/po/Makefile | 0 .../share/web/noVNC-1.1.0/po/cs.po | 0 .../share/web/noVNC-1.1.0/po/de.po | 0 .../share/web/noVNC-1.1.0/po/el.po | 0 .../share/web/noVNC-1.1.0/po/es.po | 0 .../share/web/noVNC-1.1.0/po/ko.po | 0 .../share/web/noVNC-1.1.0/po/nl.po | 0 .../share/web/noVNC-1.1.0/po/noVNC.pot | 0 .../share/web/noVNC-1.1.0/po/pl.po | 0 .../share/web/noVNC-1.1.0/po/po2js | 0 .../share/web/noVNC-1.1.0/po/ru.po | 0 .../share/web/noVNC-1.1.0/po/sv.po | 0 .../share/web/noVNC-1.1.0/po/tr.po | 0 .../share/web/noVNC-1.1.0/po/xgettext-html | 0 .../share/web/noVNC-1.1.0/po/zh_CN.po | 0 .../share/web/noVNC-1.1.0/po/zh_TW.po | 0 .../share/web/noVNC-1.1.0/tests/.eslintrc | 0 .../share/web/noVNC-1.1.0/tests/assertions.js | 0 .../web/noVNC-1.1.0/tests/fake.websocket.js | 0 .../web/noVNC-1.1.0/tests/karma-test-main.js | 0 .../web/noVNC-1.1.0/tests/playback-ui.js | 0 .../share/web/noVNC-1.1.0/tests/playback.js | 0 .../web/noVNC-1.1.0/tests/test.base64.js | 0 .../web/noVNC-1.1.0/tests/test.display.js | 0 .../web/noVNC-1.1.0/tests/test.helper.js | 0 .../web/noVNC-1.1.0/tests/test.keyboard.js | 0 .../noVNC-1.1.0/tests/test.localization.js | 0 .../share/web/noVNC-1.1.0/tests/test.mouse.js | 0 .../share/web/noVNC-1.1.0/tests/test.rfb.js | 0 .../share/web/noVNC-1.1.0/tests/test.util.js | 0 .../web/noVNC-1.1.0/tests/test.websock.js | 0 .../web/noVNC-1.1.0/tests/test.webutil.js | 0 .../web/noVNC-1.1.0/tests/vnc_playback.html | 0 .../share/web/noVNC-1.1.0/utils/.eslintrc | 0 .../share/web/noVNC-1.1.0/utils/README.md | 0 .../web/noVNC-1.1.0/utils/b64-to-binary.pl | 0 .../web/noVNC-1.1.0/utils/genkeysymdef.js | 0 .../share/web/noVNC-1.1.0/utils/img2js.py | 0 .../share/web/noVNC-1.1.0/utils/json2graph.py | 0 .../share/web/noVNC-1.1.0/utils/launch.sh | 0 .../share/web/noVNC-1.1.0/utils/u2x11 | 0 .../web/noVNC-1.1.0/utils/use_require.js | 0 .../noVNC-1.1.0/utils/use_require_helpers.js | 0 .../share/web/noVNC-1.1.0/utils/validate | 0 .../vendor/browser-es-module-loader/README.md | 0 .../dist/babel-worker.js | 0 .../dist/browser-es-module-loader.js | 0 .../dist/browser-es-module-loader.js.map | 0 .../browser-es-module-loader/rollup.config.js | 0 .../src/babel-worker.js | 0 .../src/browser-es-module-loader.js | 0 .../share/web/noVNC-1.1.0/vendor/pako/LICENSE | 0 .../web/noVNC-1.1.0/vendor/pako/README.md | 0 .../vendor/pako/lib/utils/common.js | 0 .../vendor/pako/lib/zlib/adler32.js | 0 .../vendor/pako/lib/zlib/constants.js | 0 .../noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js | 0 .../vendor/pako/lib/zlib/deflate.js | 0 .../vendor/pako/lib/zlib/gzheader.js | 0 .../vendor/pako/lib/zlib/inffast.js | 0 .../vendor/pako/lib/zlib/inflate.js | 0 .../vendor/pako/lib/zlib/inftrees.js | 0 .../vendor/pako/lib/zlib/messages.js | 0 .../noVNC-1.1.0/vendor/pako/lib/zlib/trees.js | 0 .../vendor/pako/lib/zlib/zstream.js | 0 .../share/web/noVNC-1.1.0/vendor/promise.js | 0 .../share/web/noVNC-1.1.0/vnc.html | 0 .../share/web/noVNC-1.1.0/vnc_lite.html | 11 ++++---- .../share/xstartup | 0 ...upyter-desktop-server-serverextension.json | 7 ----- jupyter_desktop_server/handlers.py | 24 ----------------- setup.py | 5 +--- 245 files changed, 14 insertions(+), 62 deletions(-) rename {jupyter_desktop_server => jupyter_desktop}/__init__.py (60%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/Xvnc (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/vncconfig (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/vncpasswd (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/vncserver (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/vncviewer (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/bin/x0vncserver (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/lib64/swrast_dri.so (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/lib64/xorg/protocol.txt (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/applications/vncviewer.desktop (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/doc/tigervnc-1.9.0/LICENCE.TXT (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/doc/tigervnc-1.9.0/README.rst (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/16x16/apps/tigervnc.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/22x22/apps/tigervnc.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/24x24/apps/tigervnc.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/32x32/apps/tigervnc.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/48x48/apps/tigervnc.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/icons/hicolor/scalable/apps/tigervnc.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/bg/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/cs/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/da/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/de/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/el/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/eo/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/es/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/fi/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/fr/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/fur/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/hu/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/id/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/it/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/nl/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/pl/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/pt_BR/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/ru/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/sk/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/sr/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/sv/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/tr/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/uk/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/vi/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/locale/zh_CN/LC_MESSAGES/tigervnc.mo (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/Xvnc.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/vncconfig.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/vncpasswd.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/vncserver.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/vncviewer.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/man/man1/x0vncserver.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/usr/local/share/vnc/classes/README (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/usr/local/share/vnc/classes/VncViewer.jar (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/usr/local/share/vnc/classes/favicon.ico (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/tigervnc/share/usr/local/share/vnc/classes/index.vnc (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.eslintignore (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.eslintrc (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/bug_report.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/feature_request.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.gitignore (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.gitmodules (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/.travis.yml (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/AUTHORS (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/LICENSE.txt (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/README.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/VERSION (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/error-handler.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/alt.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/clipboard.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/connect.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/ctrl.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/ctrlaltdel.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/disconnect.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/drag.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/error.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/esc.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/expander.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/fullscreen.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/handle.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/handle_bg.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/Makefile (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-120x120.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-144x144.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-152x152.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-16x16.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-192x192.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-24x24.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-32x32.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-48x48.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-60x60.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-64x64.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-72x72.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-76x76.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-96x96.png (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-icon-sm.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/icons/novnc-icon.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/info.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/keyboard.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/mouse_left.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/mouse_middle.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/mouse_none.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/mouse_right.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/power.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/settings.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/tab.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/toggleextrakeys.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/warning.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/images/windows.svg (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/cs.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/de.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/el.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/es.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/ko.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/nl.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/pl.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/ru.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/sv.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/tr.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/zh_CN.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/locale/zh_TW.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/localization.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/sounds/CREDITS (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/sounds/bell.mp3 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/sounds/bell.oga (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/styles/Orbitron700.ttf (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/styles/Orbitron700.woff (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/styles/base.css (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/ui.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/app/webutil.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/base64.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/copyrect.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/hextile.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/raw.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/rre.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/tight.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/decoders/tightpng.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/des.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/display.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/encodings.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/inflator.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/domkeytable.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/fixedkeys.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/keyboard.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/keysym.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/keysymdef.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/mouse.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/util.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/vkeys.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/input/xtscancodes.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/rfb.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/browser.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/cursor.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/events.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/eventtarget.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/logging.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/polyfill.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/util/strings.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/core/websock.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/API-internal.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/API.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/EMBEDDING.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/LIBRARY.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/flash_policy.txt (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/links (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/notes (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/rfb_notes (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/rfbproto-3.3.pdf (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/rfbproto-3.7.pdf (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/docs/rfbproto-3.8.pdf (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/karma.conf.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/package.json (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/Makefile (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/cs.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/de.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/el.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/es.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/ko.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/nl.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/noVNC.pot (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/pl.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/po2js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/ru.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/sv.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/tr.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/xgettext-html (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/zh_CN.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/po/zh_TW.po (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/.eslintrc (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/assertions.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/fake.websocket.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/karma-test-main.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/playback-ui.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/playback.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.base64.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.display.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.helper.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.keyboard.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.localization.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.mouse.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.rfb.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.util.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.websock.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/test.webutil.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/tests/vnc_playback.html (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/.eslintrc (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/README.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/b64-to-binary.pl (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/genkeysymdef.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/img2js.py (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/json2graph.py (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/launch.sh (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/u2x11 (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/use_require.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/use_require_helpers.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/utils/validate (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/README.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/babel-worker.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js.map (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/rollup.config.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/babel-worker.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/browser-es-module-loader.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/LICENSE (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/README.md (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/utils/common.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/adler32.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/constants.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/deflate.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/gzheader.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inffast.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inflate.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inftrees.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/messages.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/trees.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/zstream.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vendor/promise.js (100%) rename {jupyter_desktop_server => jupyter_desktop}/share/web/noVNC-1.1.0/vnc.html (100%) rename jupyter_desktop_server/templates/desktop.html => jupyter_desktop/share/web/noVNC-1.1.0/vnc_lite.html (94%) rename {jupyter_desktop_server => jupyter_desktop}/share/xstartup (100%) delete mode 100644 jupyter_desktop_server/etc/jupyter-desktop-server-serverextension.json delete mode 100644 jupyter_desktop_server/handlers.py diff --git a/MANIFEST.in b/MANIFEST.in index e8a34cd..a7e97ca 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1 @@ -graft jupyter_desktop_server/share -graft jupyter_desktop_server/etc -graft jupyter_desktop_server/templates +graft jupyter_desktop/share \ No newline at end of file diff --git a/jupyter_desktop_server/__init__.py b/jupyter_desktop/__init__.py similarity index 60% rename from jupyter_desktop_server/__init__.py rename to jupyter_desktop/__init__.py index 1a0a610..d24b673 100644 --- a/jupyter_desktop_server/__init__.py +++ b/jupyter_desktop/__init__.py @@ -1,20 +1,17 @@ import os import shlex import tempfile -from notebook.utils import url_path_join as ujoin -from tornado.web import StaticFileHandler -from .handlers import DesktopHandler HERE = os.path.dirname(os.path.abspath(__file__)) -def setup_vnc(): +def setup_desktop(): # make a secure temporary directory for sockets # This is only readable, writeable & searchable by our uid sockets_dir = tempfile.mkdtemp() sockets_path = os.path.join(sockets_dir, 'vnc-socket') - vnc_command = [ + vnc_command = ' '.join((shlex.quote(p) for p in [ os.path.join(HERE, 'share/tigervnc/bin/vncserver'), '-verbose', '-xstartup', os.path.join(HERE, 'share/xstartup'), @@ -23,7 +20,7 @@ def setup_vnc(): '-rfbunixpath', sockets_path, '-fg', ':1', - ] + ])) return { 'command': [ 'websockify', '-v', @@ -32,18 +29,10 @@ def setup_vnc(): '5901', '--unix-target', sockets_path, '--', - ] + vnc_command, + '/bin/sh', '-c', + f'cd {os.getcwd()} && {vnc_command}' + ], 'port': 5901, 'timeout': 30, + 'mappath': {'/': '/vnc_lite.html'}, } - - -def load_jupyter_server_extension(nbapp): - # Set up handlers picked up via config - base_url = nbapp.web_app.settings['base_url'] - - web_path = os.path.join(HERE, 'share/web') - nbapp.web_app.add_handlers('.*', [ - (ujoin(base_url, 'desktop-server/static/(.*)'), StaticFileHandler, {'path': web_path}), - (ujoin(base_url, 'desktop'), DesktopHandler) - ]) diff --git a/jupyter_desktop_server/share/tigervnc/bin/Xvnc b/jupyter_desktop/share/tigervnc/bin/Xvnc similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/Xvnc rename to jupyter_desktop/share/tigervnc/bin/Xvnc diff --git a/jupyter_desktop_server/share/tigervnc/bin/vncconfig b/jupyter_desktop/share/tigervnc/bin/vncconfig similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/vncconfig rename to jupyter_desktop/share/tigervnc/bin/vncconfig diff --git a/jupyter_desktop_server/share/tigervnc/bin/vncpasswd b/jupyter_desktop/share/tigervnc/bin/vncpasswd similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/vncpasswd rename to jupyter_desktop/share/tigervnc/bin/vncpasswd diff --git a/jupyter_desktop_server/share/tigervnc/bin/vncserver b/jupyter_desktop/share/tigervnc/bin/vncserver similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/vncserver rename to jupyter_desktop/share/tigervnc/bin/vncserver diff --git a/jupyter_desktop_server/share/tigervnc/bin/vncviewer b/jupyter_desktop/share/tigervnc/bin/vncviewer similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/vncviewer rename to jupyter_desktop/share/tigervnc/bin/vncviewer diff --git a/jupyter_desktop_server/share/tigervnc/bin/x0vncserver b/jupyter_desktop/share/tigervnc/bin/x0vncserver similarity index 100% rename from jupyter_desktop_server/share/tigervnc/bin/x0vncserver rename to jupyter_desktop/share/tigervnc/bin/x0vncserver diff --git a/jupyter_desktop_server/share/tigervnc/lib64/swrast_dri.so b/jupyter_desktop/share/tigervnc/lib64/swrast_dri.so similarity index 100% rename from jupyter_desktop_server/share/tigervnc/lib64/swrast_dri.so rename to jupyter_desktop/share/tigervnc/lib64/swrast_dri.so diff --git a/jupyter_desktop_server/share/tigervnc/lib64/xorg/protocol.txt b/jupyter_desktop/share/tigervnc/lib64/xorg/protocol.txt similarity index 100% rename from jupyter_desktop_server/share/tigervnc/lib64/xorg/protocol.txt rename to jupyter_desktop/share/tigervnc/lib64/xorg/protocol.txt diff --git a/jupyter_desktop_server/share/tigervnc/share/applications/vncviewer.desktop b/jupyter_desktop/share/tigervnc/share/applications/vncviewer.desktop similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/applications/vncviewer.desktop rename to jupyter_desktop/share/tigervnc/share/applications/vncviewer.desktop diff --git a/jupyter_desktop_server/share/tigervnc/share/doc/tigervnc-1.9.0/LICENCE.TXT b/jupyter_desktop/share/tigervnc/share/doc/tigervnc-1.9.0/LICENCE.TXT similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/doc/tigervnc-1.9.0/LICENCE.TXT rename to jupyter_desktop/share/tigervnc/share/doc/tigervnc-1.9.0/LICENCE.TXT diff --git a/jupyter_desktop_server/share/tigervnc/share/doc/tigervnc-1.9.0/README.rst b/jupyter_desktop/share/tigervnc/share/doc/tigervnc-1.9.0/README.rst similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/doc/tigervnc-1.9.0/README.rst rename to jupyter_desktop/share/tigervnc/share/doc/tigervnc-1.9.0/README.rst diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/16x16/apps/tigervnc.png b/jupyter_desktop/share/tigervnc/share/icons/hicolor/16x16/apps/tigervnc.png similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/16x16/apps/tigervnc.png rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/16x16/apps/tigervnc.png diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/22x22/apps/tigervnc.png b/jupyter_desktop/share/tigervnc/share/icons/hicolor/22x22/apps/tigervnc.png similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/22x22/apps/tigervnc.png rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/22x22/apps/tigervnc.png diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/24x24/apps/tigervnc.png b/jupyter_desktop/share/tigervnc/share/icons/hicolor/24x24/apps/tigervnc.png similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/24x24/apps/tigervnc.png rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/24x24/apps/tigervnc.png diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/32x32/apps/tigervnc.png b/jupyter_desktop/share/tigervnc/share/icons/hicolor/32x32/apps/tigervnc.png similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/32x32/apps/tigervnc.png rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/32x32/apps/tigervnc.png diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/48x48/apps/tigervnc.png b/jupyter_desktop/share/tigervnc/share/icons/hicolor/48x48/apps/tigervnc.png similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/48x48/apps/tigervnc.png rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/48x48/apps/tigervnc.png diff --git a/jupyter_desktop_server/share/tigervnc/share/icons/hicolor/scalable/apps/tigervnc.svg b/jupyter_desktop/share/tigervnc/share/icons/hicolor/scalable/apps/tigervnc.svg similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/icons/hicolor/scalable/apps/tigervnc.svg rename to jupyter_desktop/share/tigervnc/share/icons/hicolor/scalable/apps/tigervnc.svg diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/bg/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/bg/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/bg/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/bg/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/cs/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/cs/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/cs/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/cs/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/da/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/da/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/da/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/da/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/de/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/de/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/de/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/de/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/el/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/el/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/el/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/el/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/eo/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/eo/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/eo/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/eo/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/es/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/es/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/es/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/es/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/fi/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/fi/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/fi/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/fi/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/fr/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/fr/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/fr/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/fr/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/fur/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/fur/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/fur/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/fur/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/hu/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/hu/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/hu/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/hu/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/id/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/id/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/id/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/id/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/it/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/it/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/it/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/it/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/nl/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/nl/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/nl/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/nl/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/pl/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/pl/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/pl/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/pl/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/pt_BR/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/pt_BR/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/pt_BR/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/pt_BR/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/ru/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/ru/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/ru/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/ru/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/sk/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/sk/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/sk/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/sk/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/sr/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/sr/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/sr/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/sr/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/sv/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/sv/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/sv/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/sv/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/tr/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/tr/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/tr/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/tr/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/uk/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/uk/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/uk/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/uk/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/vi/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/vi/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/vi/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/vi/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/locale/zh_CN/LC_MESSAGES/tigervnc.mo b/jupyter_desktop/share/tigervnc/share/locale/zh_CN/LC_MESSAGES/tigervnc.mo similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/locale/zh_CN/LC_MESSAGES/tigervnc.mo rename to jupyter_desktop/share/tigervnc/share/locale/zh_CN/LC_MESSAGES/tigervnc.mo diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/Xvnc.1 b/jupyter_desktop/share/tigervnc/share/man/man1/Xvnc.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/Xvnc.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/Xvnc.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/vncconfig.1 b/jupyter_desktop/share/tigervnc/share/man/man1/vncconfig.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/vncconfig.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/vncconfig.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/vncpasswd.1 b/jupyter_desktop/share/tigervnc/share/man/man1/vncpasswd.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/vncpasswd.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/vncpasswd.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/vncserver.1 b/jupyter_desktop/share/tigervnc/share/man/man1/vncserver.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/vncserver.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/vncserver.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/vncviewer.1 b/jupyter_desktop/share/tigervnc/share/man/man1/vncviewer.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/vncviewer.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/vncviewer.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/man/man1/x0vncserver.1 b/jupyter_desktop/share/tigervnc/share/man/man1/x0vncserver.1 similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/man/man1/x0vncserver.1 rename to jupyter_desktop/share/tigervnc/share/man/man1/x0vncserver.1 diff --git a/jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/README b/jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/README similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/README rename to jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/README diff --git a/jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/VncViewer.jar b/jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/VncViewer.jar similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/VncViewer.jar rename to jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/VncViewer.jar diff --git a/jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/favicon.ico b/jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/favicon.ico similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/favicon.ico rename to jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/favicon.ico diff --git a/jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/index.vnc b/jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/index.vnc similarity index 100% rename from jupyter_desktop_server/share/tigervnc/share/usr/local/share/vnc/classes/index.vnc rename to jupyter_desktop/share/tigervnc/share/usr/local/share/vnc/classes/index.vnc diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.eslintignore b/jupyter_desktop/share/web/noVNC-1.1.0/.eslintignore similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.eslintignore rename to jupyter_desktop/share/web/noVNC-1.1.0/.eslintignore diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.eslintrc b/jupyter_desktop/share/web/noVNC-1.1.0/.eslintrc similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.eslintrc rename to jupyter_desktop/share/web/noVNC-1.1.0/.eslintrc diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/bug_report.md b/jupyter_desktop/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/bug_report.md rename to jupyter_desktop/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/feature_request.md b/jupyter_desktop/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/feature_request.md rename to jupyter_desktop/share/web/noVNC-1.1.0/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.gitignore b/jupyter_desktop/share/web/noVNC-1.1.0/.gitignore similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.gitignore rename to jupyter_desktop/share/web/noVNC-1.1.0/.gitignore diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.gitmodules b/jupyter_desktop/share/web/noVNC-1.1.0/.gitmodules similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.gitmodules rename to jupyter_desktop/share/web/noVNC-1.1.0/.gitmodules diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/.travis.yml b/jupyter_desktop/share/web/noVNC-1.1.0/.travis.yml similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/.travis.yml rename to jupyter_desktop/share/web/noVNC-1.1.0/.travis.yml diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/AUTHORS b/jupyter_desktop/share/web/noVNC-1.1.0/AUTHORS similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/AUTHORS rename to jupyter_desktop/share/web/noVNC-1.1.0/AUTHORS diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/LICENSE.txt b/jupyter_desktop/share/web/noVNC-1.1.0/LICENSE.txt similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/LICENSE.txt rename to jupyter_desktop/share/web/noVNC-1.1.0/LICENSE.txt diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/README.md b/jupyter_desktop/share/web/noVNC-1.1.0/README.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/README.md rename to jupyter_desktop/share/web/noVNC-1.1.0/README.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/VERSION b/jupyter_desktop/share/web/noVNC-1.1.0/VERSION similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/VERSION rename to jupyter_desktop/share/web/noVNC-1.1.0/VERSION diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/error-handler.js b/jupyter_desktop/share/web/noVNC-1.1.0/app/error-handler.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/error-handler.js rename to jupyter_desktop/share/web/noVNC-1.1.0/app/error-handler.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/alt.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/alt.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/alt.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/alt.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/clipboard.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/clipboard.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/clipboard.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/clipboard.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/connect.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/connect.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/connect.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/connect.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/ctrl.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/ctrl.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/ctrl.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/ctrl.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/ctrlaltdel.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/ctrlaltdel.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/ctrlaltdel.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/ctrlaltdel.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/disconnect.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/disconnect.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/disconnect.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/disconnect.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/drag.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/drag.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/drag.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/drag.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/error.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/error.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/error.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/error.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/esc.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/esc.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/esc.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/esc.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/expander.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/expander.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/expander.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/expander.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/fullscreen.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/fullscreen.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/fullscreen.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/fullscreen.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/handle.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/handle.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/handle.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/handle.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/handle_bg.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/handle_bg.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/handle_bg.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/handle_bg.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/Makefile b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/Makefile similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/Makefile rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/Makefile diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-120x120.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-120x120.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-120x120.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-120x120.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-144x144.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-144x144.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-144x144.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-144x144.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-152x152.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-152x152.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-152x152.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-152x152.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-16x16.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-16x16.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-16x16.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-16x16.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-192x192.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-192x192.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-192x192.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-192x192.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-24x24.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-24x24.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-24x24.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-24x24.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-32x32.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-32x32.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-32x32.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-32x32.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-48x48.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-48x48.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-48x48.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-48x48.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-60x60.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-60x60.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-60x60.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-60x60.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-64x64.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-64x64.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-64x64.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-64x64.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-72x72.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-72x72.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-72x72.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-72x72.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-76x76.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-76x76.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-76x76.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-76x76.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-96x96.png b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-96x96.png similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-96x96.png rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-96x96.png diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-icon-sm.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-icon-sm.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-icon-sm.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-icon-sm.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-icon.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-icon.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/icons/novnc-icon.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/icons/novnc-icon.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/info.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/info.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/info.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/info.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/keyboard.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/keyboard.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/keyboard.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/keyboard.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_left.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_left.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_left.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_left.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_middle.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_middle.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_middle.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_middle.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_none.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_none.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_none.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_none.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_right.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_right.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/mouse_right.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/mouse_right.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/power.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/power.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/power.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/power.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/settings.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/settings.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/settings.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/settings.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/tab.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/tab.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/tab.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/tab.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/toggleextrakeys.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/toggleextrakeys.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/toggleextrakeys.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/toggleextrakeys.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/warning.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/warning.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/warning.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/warning.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/windows.svg b/jupyter_desktop/share/web/noVNC-1.1.0/app/images/windows.svg similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/images/windows.svg rename to jupyter_desktop/share/web/noVNC-1.1.0/app/images/windows.svg diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/cs.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/cs.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/cs.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/cs.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/de.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/de.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/de.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/de.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/el.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/el.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/el.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/el.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/es.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/es.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/es.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/es.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/ko.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/ko.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/ko.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/ko.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/nl.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/nl.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/nl.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/nl.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/pl.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/pl.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/pl.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/pl.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/ru.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/ru.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/ru.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/ru.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/sv.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/sv.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/sv.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/sv.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/tr.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/tr.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/tr.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/tr.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/zh_CN.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/zh_CN.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/zh_CN.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/zh_CN.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/zh_TW.json b/jupyter_desktop/share/web/noVNC-1.1.0/app/locale/zh_TW.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/locale/zh_TW.json rename to jupyter_desktop/share/web/noVNC-1.1.0/app/locale/zh_TW.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/localization.js b/jupyter_desktop/share/web/noVNC-1.1.0/app/localization.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/localization.js rename to jupyter_desktop/share/web/noVNC-1.1.0/app/localization.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/CREDITS b/jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/CREDITS similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/CREDITS rename to jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/CREDITS diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/bell.mp3 b/jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/bell.mp3 similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/bell.mp3 rename to jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/bell.mp3 diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/bell.oga b/jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/bell.oga similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/sounds/bell.oga rename to jupyter_desktop/share/web/noVNC-1.1.0/app/sounds/bell.oga diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/Orbitron700.ttf b/jupyter_desktop/share/web/noVNC-1.1.0/app/styles/Orbitron700.ttf similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/Orbitron700.ttf rename to jupyter_desktop/share/web/noVNC-1.1.0/app/styles/Orbitron700.ttf diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/Orbitron700.woff b/jupyter_desktop/share/web/noVNC-1.1.0/app/styles/Orbitron700.woff similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/Orbitron700.woff rename to jupyter_desktop/share/web/noVNC-1.1.0/app/styles/Orbitron700.woff diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/base.css b/jupyter_desktop/share/web/noVNC-1.1.0/app/styles/base.css similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/styles/base.css rename to jupyter_desktop/share/web/noVNC-1.1.0/app/styles/base.css diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/ui.js b/jupyter_desktop/share/web/noVNC-1.1.0/app/ui.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/ui.js rename to jupyter_desktop/share/web/noVNC-1.1.0/app/ui.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/app/webutil.js b/jupyter_desktop/share/web/noVNC-1.1.0/app/webutil.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/app/webutil.js rename to jupyter_desktop/share/web/noVNC-1.1.0/app/webutil.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/base64.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/base64.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/base64.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/base64.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/copyrect.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/copyrect.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/copyrect.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/copyrect.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/hextile.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/hextile.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/hextile.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/hextile.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/raw.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/raw.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/raw.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/raw.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/rre.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/rre.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/rre.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/rre.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/tight.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/tight.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/tight.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/tight.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/tightpng.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/tightpng.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/decoders/tightpng.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/decoders/tightpng.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/des.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/des.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/des.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/des.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/display.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/display.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/display.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/display.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/encodings.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/encodings.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/encodings.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/encodings.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/inflator.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/inflator.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/inflator.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/inflator.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/domkeytable.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/domkeytable.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/domkeytable.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/domkeytable.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/fixedkeys.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/fixedkeys.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/fixedkeys.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/fixedkeys.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keyboard.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/keyboard.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keyboard.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/keyboard.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keysym.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/keysym.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keysym.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/keysym.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keysymdef.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/keysymdef.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/keysymdef.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/keysymdef.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/mouse.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/mouse.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/mouse.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/mouse.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/util.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/util.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/util.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/util.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/vkeys.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/vkeys.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/vkeys.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/vkeys.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/xtscancodes.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/input/xtscancodes.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/input/xtscancodes.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/input/xtscancodes.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/rfb.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/rfb.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/rfb.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/rfb.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/browser.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/browser.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/browser.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/browser.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/cursor.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/cursor.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/cursor.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/cursor.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/events.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/events.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/events.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/events.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/eventtarget.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/eventtarget.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/eventtarget.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/eventtarget.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/logging.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/logging.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/logging.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/logging.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/polyfill.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/polyfill.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/polyfill.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/polyfill.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/strings.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/util/strings.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/util/strings.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/util/strings.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/core/websock.js b/jupyter_desktop/share/web/noVNC-1.1.0/core/websock.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/core/websock.js rename to jupyter_desktop/share/web/noVNC-1.1.0/core/websock.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/API-internal.md b/jupyter_desktop/share/web/noVNC-1.1.0/docs/API-internal.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/API-internal.md rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/API-internal.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/API.md b/jupyter_desktop/share/web/noVNC-1.1.0/docs/API.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/API.md rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/API.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/EMBEDDING.md b/jupyter_desktop/share/web/noVNC-1.1.0/docs/EMBEDDING.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/EMBEDDING.md rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/EMBEDDING.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LIBRARY.md b/jupyter_desktop/share/web/noVNC-1.1.0/docs/LIBRARY.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LIBRARY.md rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/LIBRARY.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause b/jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.BSD-2-Clause diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause b/jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.BSD-3-Clause diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 b/jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.MPL-2.0 diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 b/jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/LICENSE.OFL-1.1 diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/flash_policy.txt b/jupyter_desktop/share/web/noVNC-1.1.0/docs/flash_policy.txt similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/flash_policy.txt rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/flash_policy.txt diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/links b/jupyter_desktop/share/web/noVNC-1.1.0/docs/links similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/links rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/links diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/notes b/jupyter_desktop/share/web/noVNC-1.1.0/docs/notes similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/notes rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/notes diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfb_notes b/jupyter_desktop/share/web/noVNC-1.1.0/docs/rfb_notes similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfb_notes rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/rfb_notes diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.3.pdf b/jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.3.pdf similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.3.pdf rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.3.pdf diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.7.pdf b/jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.7.pdf similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.7.pdf rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.7.pdf diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.8.pdf b/jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.8.pdf similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/docs/rfbproto-3.8.pdf rename to jupyter_desktop/share/web/noVNC-1.1.0/docs/rfbproto-3.8.pdf diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/karma.conf.js b/jupyter_desktop/share/web/noVNC-1.1.0/karma.conf.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/karma.conf.js rename to jupyter_desktop/share/web/noVNC-1.1.0/karma.conf.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/package.json b/jupyter_desktop/share/web/noVNC-1.1.0/package.json similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/package.json rename to jupyter_desktop/share/web/noVNC-1.1.0/package.json diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/Makefile b/jupyter_desktop/share/web/noVNC-1.1.0/po/Makefile similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/Makefile rename to jupyter_desktop/share/web/noVNC-1.1.0/po/Makefile diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/cs.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/cs.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/cs.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/cs.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/de.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/de.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/de.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/de.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/el.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/el.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/el.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/el.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/es.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/es.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/es.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/es.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/ko.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/ko.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/ko.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/ko.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/nl.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/nl.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/nl.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/nl.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/noVNC.pot b/jupyter_desktop/share/web/noVNC-1.1.0/po/noVNC.pot similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/noVNC.pot rename to jupyter_desktop/share/web/noVNC-1.1.0/po/noVNC.pot diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/pl.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/pl.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/pl.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/pl.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/po2js b/jupyter_desktop/share/web/noVNC-1.1.0/po/po2js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/po2js rename to jupyter_desktop/share/web/noVNC-1.1.0/po/po2js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/ru.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/ru.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/ru.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/ru.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/sv.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/sv.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/sv.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/sv.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/tr.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/tr.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/tr.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/tr.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/xgettext-html b/jupyter_desktop/share/web/noVNC-1.1.0/po/xgettext-html similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/xgettext-html rename to jupyter_desktop/share/web/noVNC-1.1.0/po/xgettext-html diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/zh_CN.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/zh_CN.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/zh_CN.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/zh_CN.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/po/zh_TW.po b/jupyter_desktop/share/web/noVNC-1.1.0/po/zh_TW.po similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/po/zh_TW.po rename to jupyter_desktop/share/web/noVNC-1.1.0/po/zh_TW.po diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/.eslintrc b/jupyter_desktop/share/web/noVNC-1.1.0/tests/.eslintrc similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/.eslintrc rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/.eslintrc diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/assertions.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/assertions.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/assertions.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/assertions.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/fake.websocket.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/fake.websocket.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/fake.websocket.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/fake.websocket.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/karma-test-main.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/karma-test-main.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/karma-test-main.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/karma-test-main.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/playback-ui.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/playback-ui.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/playback-ui.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/playback-ui.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/playback.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/playback.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/playback.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/playback.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.base64.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.base64.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.base64.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.base64.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.display.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.display.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.display.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.display.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.helper.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.helper.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.helper.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.helper.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.keyboard.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.keyboard.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.keyboard.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.keyboard.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.localization.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.localization.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.localization.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.localization.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.mouse.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.mouse.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.mouse.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.mouse.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.rfb.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.rfb.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.rfb.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.rfb.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.util.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.util.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.util.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.util.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.websock.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.websock.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.websock.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.websock.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.webutil.js b/jupyter_desktop/share/web/noVNC-1.1.0/tests/test.webutil.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/test.webutil.js rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/test.webutil.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/tests/vnc_playback.html b/jupyter_desktop/share/web/noVNC-1.1.0/tests/vnc_playback.html similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/tests/vnc_playback.html rename to jupyter_desktop/share/web/noVNC-1.1.0/tests/vnc_playback.html diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/.eslintrc b/jupyter_desktop/share/web/noVNC-1.1.0/utils/.eslintrc similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/.eslintrc rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/.eslintrc diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/README.md b/jupyter_desktop/share/web/noVNC-1.1.0/utils/README.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/README.md rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/README.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/b64-to-binary.pl b/jupyter_desktop/share/web/noVNC-1.1.0/utils/b64-to-binary.pl similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/b64-to-binary.pl rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/b64-to-binary.pl diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/genkeysymdef.js b/jupyter_desktop/share/web/noVNC-1.1.0/utils/genkeysymdef.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/genkeysymdef.js rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/genkeysymdef.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/img2js.py b/jupyter_desktop/share/web/noVNC-1.1.0/utils/img2js.py similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/img2js.py rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/img2js.py diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/json2graph.py b/jupyter_desktop/share/web/noVNC-1.1.0/utils/json2graph.py similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/json2graph.py rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/json2graph.py diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/launch.sh b/jupyter_desktop/share/web/noVNC-1.1.0/utils/launch.sh similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/launch.sh rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/launch.sh diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/u2x11 b/jupyter_desktop/share/web/noVNC-1.1.0/utils/u2x11 similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/u2x11 rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/u2x11 diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/use_require.js b/jupyter_desktop/share/web/noVNC-1.1.0/utils/use_require.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/use_require.js rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/use_require.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/use_require_helpers.js b/jupyter_desktop/share/web/noVNC-1.1.0/utils/use_require_helpers.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/use_require_helpers.js rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/use_require_helpers.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/utils/validate b/jupyter_desktop/share/web/noVNC-1.1.0/utils/validate similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/utils/validate rename to jupyter_desktop/share/web/noVNC-1.1.0/utils/validate diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/README.md b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/README.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/README.md rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/README.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/babel-worker.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/babel-worker.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/babel-worker.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/babel-worker.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js.map b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js.map similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js.map rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/dist/browser-es-module-loader.js.map diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/rollup.config.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/rollup.config.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/rollup.config.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/rollup.config.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/babel-worker.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/babel-worker.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/babel-worker.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/babel-worker.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/browser-es-module-loader.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/browser-es-module-loader.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/browser-es-module-loader.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/browser-es-module-loader/src/browser-es-module-loader.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/LICENSE b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/LICENSE similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/LICENSE rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/LICENSE diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/README.md b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/README.md similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/README.md rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/README.md diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/utils/common.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/utils/common.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/utils/common.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/utils/common.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/adler32.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/adler32.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/adler32.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/adler32.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/constants.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/constants.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/constants.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/constants.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/crc32.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/deflate.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/deflate.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/deflate.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/deflate.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/gzheader.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/gzheader.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/gzheader.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/gzheader.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inffast.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inffast.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inffast.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inffast.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inflate.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inflate.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inflate.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inflate.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inftrees.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inftrees.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inftrees.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/inftrees.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/messages.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/messages.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/messages.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/messages.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/trees.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/trees.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/trees.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/trees.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/zstream.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/zstream.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/zstream.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/pako/lib/zlib/zstream.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/promise.js b/jupyter_desktop/share/web/noVNC-1.1.0/vendor/promise.js similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vendor/promise.js rename to jupyter_desktop/share/web/noVNC-1.1.0/vendor/promise.js diff --git a/jupyter_desktop_server/share/web/noVNC-1.1.0/vnc.html b/jupyter_desktop/share/web/noVNC-1.1.0/vnc.html similarity index 100% rename from jupyter_desktop_server/share/web/noVNC-1.1.0/vnc.html rename to jupyter_desktop/share/web/noVNC-1.1.0/vnc.html diff --git a/jupyter_desktop_server/templates/desktop.html b/jupyter_desktop/share/web/noVNC-1.1.0/vnc_lite.html similarity index 94% rename from jupyter_desktop_server/templates/desktop.html rename to jupyter_desktop/share/web/noVNC-1.1.0/vnc_lite.html index 0ceaa56..7110b55 100644 --- a/jupyter_desktop_server/templates/desktop.html +++ b/jupyter_desktop/share/web/noVNC-1.1.0/vnc_lite.html @@ -60,7 +60,7 @@ - +