Skip to content

Commit 0c04c5e

Browse files
committed
feat: upgrade noVNC
1 parent 394c340 commit 0c04c5e

File tree

489 files changed

+18236
-54516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

489 files changed

+18236
-54516
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:14.04.3
1+
FROM ubuntu:14.04
22
MAINTAINER Doro Wu <fcwu.tw@gmail.com>
33

44
ENV DEBIAN_FRONTEND noninteractive

noVNC/.gitlastcommit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
56d97524807b125d047730331031ddd00f9c61f

noVNC/.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

noVNC/.npmignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
app
2+
core
3+
.gitmodules
4+
node_modules
5+
.*
6+
*~
7+
*.swp
8+
*.swo
9+
tests
10+
.travis.yml
11+
utils
12+
docs/notes
13+
docs/links
14+
docs/release.txt
15+
docs/rfb_notes
16+
docs/*.pdf
17+
vnc.html
18+
vnc_auto.html
19+
karma.conf.js
20+
docs/flash_policy.txt

noVNC/.travis.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
language: node_js
2+
sudo: false
3+
cache:
4+
directories:
5+
- node_modules
26
node_js:
3-
- '0.11.13'
7+
- '6.1'
48
env:
59
matrix:
610
- TEST_BROWSER_NAME=PhantomJS
7-
- TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 7,Linux'
8-
- TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 7,Linux' TEST_BROWSER_VERSION='30,26'
9-
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7' TEST_BROWSER_VERSION=10
10-
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 8.1' TEST_BROWSER_VERSION=11
11-
- TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.8' TEST_BROWSER_VERSION=6
12-
- TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.9' TEST_BROWSER_VERSION=7
11+
- TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
12+
- TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
13+
- TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10'
14+
- TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11'
1315
global:
1416
- secure: QE5GqGd2hrpQsIgd8dlv3oRUUHqZayomzzQjNXOB81VQi241uz/ru+3GtBZLB5WLZCq/Gj89vbLnR0LN4ixlmPaWv3/WJQGyDGuRD/vMnccVl+rBUP/Hh2zdYwiISIGcrywNAE+KLus/lyt/ahVgzbaRaDSzrM1HaZFT/rndGck=
1517
- secure: g75sdctEwj0hoLW0Y08Tdv8s5scNzplB6a9EtaJ2vJD9S/bK+AsPqbWesGv1UlrFPCWdbV7Vg61vkmoUjcmb5xhqFIjcM9TlYJoKWeOTsOmnQoSIkIq6gMF1k02+LmKInbPgIzrp3m3jluS1qaOs/EzFpDnJp9hWBiAfXa12Jxk=

noVNC/LICENSE.txt

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ Public License 2.0). The noVNC core library is composed of the
55
Javascript code necessary for full noVNC operation. This includes (but
66
is not limited to):
77

8-
include/base64.js
9-
include/des.js
10-
include/display.js
11-
include/input.js
12-
include/jsunzip.js
13-
include/keysym.js
14-
include/logo.js
15-
include/playback.js
16-
include/rfb.js
17-
include/ui.js
18-
include/util.js
19-
include/websock.js
20-
include/webutil.js
8+
core/base64.js
9+
core/des.js
10+
core/display.js
11+
core/input/devices.js
12+
core/input/keysym.js
13+
core/logo.js
14+
core/playback.js
15+
core/rfb.js
16+
app/ui.js
17+
core/util.js
18+
core/websock.js
19+
app/webutil.js
20+
core/input/xtscancodes.js
2121

2222
The HTML, CSS, font and images files that included with the noVNC
2323
source distibution (or repository) are not considered part of the
@@ -29,12 +29,12 @@ The HTML, CSS, font and image files are licensed as follows:
2929

3030
*.html : 2-Clause BSD license
3131

32-
include/*.css : 2-Clause BSD license
32+
app/styles/*.css : 2-Clause BSD license
3333

34-
include/Orbitron* : SIL Open Font License 1.1
34+
app/styles/Orbitron* : SIL Open Font License 1.1
3535
(Copyright 2009 Matt McInerney)
3636

37-
images/ : Creative Commons Attribution-ShareAlike
37+
app/images/ : Creative Commons Attribution-ShareAlike
3838
http://creativecommons.org/licenses/by-sa/3.0/
3939

4040
Some portions of noVNC are copyright to their individual authors.
@@ -45,20 +45,16 @@ The are several files and projects that have been incorporated into
4545
the noVNC core library. Here is a list of those files and the original
4646
licenses (all MPL 2.0 compatible):
4747

48-
include/base64.js : MPL 2.0
49-
50-
include/des.js : Various BSD style licenses
48+
core/base64.js : MPL 2.0
5149

52-
include/jsunzip.js : zlib/libpng license
50+
core/des.js : Various BSD style licenses
5351

54-
include/web-socket-js/ : New BSD license (3-clause). Source code at
55-
http://github.com/gimite/web-socket-js
52+
utils/inflator.mod.js
53+
include/inflator.js : MIT (for pako)
5654

57-
include/chrome-app/tcp-stream.js
58-
: Apache 2.0 license
59-
60-
utils/websockify
61-
utils/websocket.py : LGPL 3
55+
Any other files not mentioned above are typically marked with
56+
a copyright/license header at the top of the file. The default noVNC
57+
license is MPL-2.0.
6258

6359
The following license texts are included:
6460

@@ -70,6 +66,7 @@ The following license texts are included:
7066
docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
7167
docs/LICENSE.zlib
7268
docs/LICENSE.Apache-2.0
69+
docs/LICENSE.pako
7370

7471
Or alternatively the license texts may be found here:
7572

noVNC/README.md

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
## noVNC: HTML5 VNC Client
22

3-
[![Build Status](https://travis-ci.org/kanaka/noVNC.svg?branch=master)](https://travis-ci.org/kanaka/noVNC)
3+
[![Build Status](https://travis-ci.org/novnc/noVNC.svg?branch=master)](https://travis-ci.org/novnc/noVNC)
44

55
### Description
66

7-
noVNC is a HTML5 VNC client that runs well in any modern browser
8-
including mobile browsers (iPhone/iPad and Android).
7+
noVNC is a HTML5 VNC client that runs well in any modern browser including
8+
mobile browsers (iOS and Android).
99

10-
Many companies/projects have integrated noVNC including [Ganeti Web
11-
Manager](http://code.osuosl.org/projects/ganeti-webmgr),
10+
Many companies, projects and products have integrated noVNC including
11+
[Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr),
1212
[OpenStack](http://www.openstack.org),
13-
[OpenNebula](http://opennebula.org/), and
14-
[LibVNCServer](http://libvncserver.sourceforge.net). See [the Projects
15-
and Companies wiki
16-
page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC)
13+
[OpenNebula](http://opennebula.org/),
14+
[LibVNCServer](http://libvncserver.sourceforge.net), and
15+
[ThinLinc](https://cendio.com/thinlinc). See
16+
[the Projects and Companies wiki page](https://github.com/novnc/noVNC/wiki/Projects-and-companies-using-noVNC)
1717
for a more complete list with additional info and links.
1818

1919
### News/help/contact
2020

2121
Notable commits, announcements and news are posted to
22-
<a href="http://www.twitter.com/noVNC">@noVNC</a>
22+
<a href="http://www.twitter.com/noVNC">@noVNC</a>.
2323

24-
If you are a noVNC developer/integrator/user (or want to be) please
25-
join the <a
26-
href="https://groups.google.com/forum/?fromgroups#!forum/novnc">noVNC
27-
discussion group</a>
24+
If you are a noVNC developer/integrator/user (or want to be) please join the
25+
<a href="https://groups.google.com/forum/?fromgroups#!forum/novnc">
26+
noVNC discussion group</a>.
2827

29-
Bugs and feature requests can be submitted via [github
30-
issues](https://github.com/kanaka/noVNC/issues). If you are looking
31-
for a place to start contributing to noVNC, a good place to start
32-
would be the issues that are marked as
33-
["patchwelcome"](https://github.com/kanaka/noVNC/issues?labels=patchwelcome).
28+
Bugs and feature requests can be submitted via
29+
[github issues](https://github.com/novnc/noVNC/issues).
30+
If you are looking for a place to start contributing to noVNC, a good place to
31+
start would be the issues that are marked as
32+
["patchwelcome"](https://github.com/novnc/noVNC/issues?labels=patchwelcome).
3433

35-
If you want to show appreciation for noVNC you could donate to a great
36-
non-profits such as: [Compassion
37-
International](http://www.compassion.com/), [SIL](http://www.sil.org),
38-
[Habitat for Humanity](http://www.habitat.org), [Electronic Frontier
39-
Foundation](https://www.eff.org/), [Against Malaria
40-
Foundation](http://www.againstmalaria.com/), [Nothing But
41-
Nets](http://www.nothingbutnets.net/), etc. Please tweet <a
42-
href="http://www.twitter.com/noVNC">@noVNC</a> if you do.
34+
If you want to show appreciation for noVNC you could donate to a great non-
35+
profits such as:
36+
[Compassion International](http://www.compassion.com/),
37+
[SIL](http://www.sil.org),
38+
[Habitat for Humanity](http://www.habitat.org),
39+
[Electronic Frontier Foundation](https://www.eff.org/),
40+
[Against Malaria Foundation](http://www.againstmalaria.com/),
41+
[Nothing But Nets](http://www.nothingbutnets.net/), etc.
42+
Please tweet <a href="http://www.twitter.com/noVNC">@noVNC</a> if you do.
4343

4444

4545
### Features
@@ -59,61 +59,72 @@ href="http://www.twitter.com/noVNC">@noVNC</a> if you do.
5959

6060
Running in Chrome before and after connecting:
6161

62-
<img src="http://kanaka.github.com/noVNC/img/noVNC-5.png" width=400>&nbsp;<img src="http://kanaka.github.com/noVNC/img/noVNC-7.jpg" width=400>
62+
<img src="http://novnc.com/img/noVNC-5.png" width=400>&nbsp;
63+
<img src="http://novnc.com/img/noVNC-7.jpg" width=400>
6364

64-
See more screenshots <a href="http://kanaka.github.com/noVNC/screenshots.html">here</a>.
65+
See more screenshots
66+
<a href="http://novnc.com/screenshots.html">here</a>.
6567

6668

6769
### Browser Requirements
6870

69-
* HTML5 Canvas (with createImageData): Chrome, Firefox 3.6+, iOS
70-
Safari, Opera 11+, Internet Explorer 9+, etc.
71+
* Chrome 8, Firefox 4, Safari 6, Opera 12, IE 11, Edge 12, etc.
7172

72-
* HTML5 WebSockets: For browsers that do not have builtin
73-
WebSockets support, the project includes
74-
<a href="http://github.com/gimite/web-socket-js">web-socket-js</a>,
75-
a WebSockets emulator using Adobe Flash. iOS 4.2+ has built-in
76-
WebSocket support.
73+
* HTML5 Canvas, WebSockets and Typed Arrays
7774

78-
* Fast Javascript Engine: this is not strictly a requirement, but
79-
without a fast Javascript engine, noVNC might be painfully slow.
75+
* Fast Javascript Engine: this is not strictly a requirement, but without a
76+
fast Javascript engine, noVNC might be painfully slow.
8077

81-
* See the more detailed [browser compatibility wiki page](https://github.com/kanaka/noVNC/wiki/Browser-support).
78+
* See the more detailed
79+
[browser compatibility wiki page](https://github.com/novnc/noVNC/wiki/Browser-support).
8280

8381

8482
### Server Requirements
8583

86-
Unless you are using a VNC server with support for WebSockets
87-
connections (such as
88-
[x11vnc/libvncserver](http://libvncserver.sourceforge.net/),
84+
Unless you are using a VNC server with support for WebSockets connections (such
85+
as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/),
8986
[QEMU](http://www.qemu.org/), or
90-
[PocketVNC](http://www.pocketvnc.com/blog/?page_id=866)), you need to
91-
use a WebSockets to TCP socket proxy. There is a python proxy included
87+
[MobileVNC](http://www.smartlab.at/mobilevnc/)), you need to use a
88+
WebSockets to TCP socket proxy. There is a python proxy included
9289
('websockify').
9390

9491

9592
### Quick Start
9693

97-
* Use the launch script to start a mini-webserver and the WebSockets
98-
proxy (websockify). The `--vnc` option is used to specify the location of
99-
a running VNC server:
94+
* Use the launch script to start a mini-webserver and the WebSockets proxy
95+
(websockify). The `--vnc` option is used to specify the location of a running
96+
VNC server:
10097

10198
`./utils/launch.sh --vnc localhost:5901`
10299

103-
* Point your browser to the cut-and-paste URL that is output by the
104-
launch script. Enter a password if the VNC server has one
105-
configured. Hit the Connect button and enjoy!
100+
* Point your browser to the cut-and-paste URL that is output by the launch
101+
script. Enter a password if the VNC server has one configured. Hit the
102+
Connect button and enjoy!
106103

107104

108105
### Other Pages
109106

110-
* [Encrypted Connections](https://github.com/kanaka/websockify/wiki/Encrypted-Connections). How to setup websockify so that you can use encrypted connections from noVNC.
107+
* [Modules/API](https://github.com/novnc/noVNC/wiki/Modules-API) - The library
108+
modules and their Javascript API.
111109

112-
* [Advanced Usage](https://github.com/kanaka/noVNC/wiki/Advanced-usage). Starting a VNC server, advanced websockify usage, etc.
110+
* [Integration](https://github.com/novnc/noVNC/wiki/Integration) - Get noVNC
111+
to work in existing projects.
113112

114-
* [Integrating noVNC](https://github.com/kanaka/noVNC/wiki/Integration) into existing projects.
113+
* [Troubleshooting](https://github.com/novnc/noVNC/wiki/Troubleshooting) - How
114+
to troubleshoot problems.
115115

116-
* [Troubleshooting noVNC](https://github.com/kanaka/noVNC/wiki/Troubleshooting) problems.
116+
* [Encrypted Connections](https://github.com/novnc/websockify/wiki/Encrypted-Connections) -
117+
Setup websockify so that you can use encrypted connections from noVNC.
118+
119+
* [Advanced Usage](https://github.com/novnc/noVNC/wiki/Advanced-usage) -
120+
Generating an SSL certificate, starting a VNC server, advanced websockify
121+
usage, etc.
122+
123+
* [Testing](https://github.com/novnc/noVNC/wiki/Testing) - Run and write
124+
tests.
125+
126+
* [Translations](https://github.com/novnc/noVNC/wiki/Translations) - Add and
127+
modify localization for JavaScript and HTML.
117128

118129

119130
### Authors/Contributors
@@ -123,16 +134,17 @@ use a WebSockets to TCP socket proxy. There is a python proxy included
123134
* [Samuel Mannehed](https://github.com/samhed) (Cendio)
124135
* [Peter Åstrand](https://github.com/astrand) (Cendio)
125136
* [Solly Ross](https://github.com/DirectXMan12) (Red Hat / OpenStack)
137+
* [Pierre Ossman](https://github.com/CendioOssman) (Cendio)
126138

127139
* Notable contributions:
128-
* UI and Icons : Chris Gordon
140+
* UI and Icons : Pierre Ossman, Chris Gordon
129141
* Original Logo : Michael Sersen
130142
* tight encoding : Michael Tinglof (Mercuri.ca)
131143

132144
* Included libraries:
133-
* web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
134145
* as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
135146
* base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
136-
* jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
137-
* tinflate : Joergen Ibsen (ibsensoftware.com)
138147
* DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
148+
* Pako : Vitaly Puzrin (https://github.com/nodeca/pako)
149+
150+
* [Contribution guide](https://github.com/novnc/noVNC/wiki/Contributing)

0 commit comments

Comments
 (0)