From 11de0d2583ee71c48549d4ed17d359f0c618cdd6 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Fri, 14 Sep 2018 16:19:44 -0400 Subject: Change copyright header This updates the copyright header to say "The noVNC Authors". People who previously had copyright listings are now under the AUTHORS file. --- AUTHORS | 13 +++++++++++++ LICENSE.txt | 3 ++- README.md | 3 +++ app/localization.js | 2 +- app/styles/base.css | 4 +--- app/ui.js | 4 +--- app/webutil.js | 3 +-- core/display.js | 3 +-- core/encodings.js | 2 +- core/input/domkeytable.js | 2 +- core/input/fixedkeys.js | 2 +- core/input/keyboard.js | 3 +-- core/input/mouse.js | 3 +-- core/input/vkeys.js | 2 +- core/rfb.js | 4 +--- core/util/browser.js | 3 +-- core/util/cursor.js | 2 +- core/util/events.js | 2 +- core/util/eventtarget.js | 2 +- core/util/logging.js | 2 +- core/util/polyfill.js | 2 +- core/util/strings.js | 2 +- core/websock.js | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/nl.po | 2 +- po/noVNC.pot | 2 +- po/pl.po | 2 +- po/po2js | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- po/xgettext-html | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- tests/playback.js | 2 +- utils/genkeysymdef.js | 3 +-- utils/img2js.py | 2 +- utils/json2graph.py | 2 +- utils/launch.sh | 3 +-- vnc.html | 4 +--- vnc_lite.html | 3 +-- 42 files changed, 57 insertions(+), 56 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..dec0e89 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,13 @@ +maintainers: +- Joel Martin (@kanaka) +- Solly Ross (@directxman12) +- Samuel Mannehed for Cendio AB (@samhed) +- Pierre Ossman for Cendio AB (@CendioOssman) +maintainersEmeritus: +- @astrand +contributors: +# There are a bunch of people that should be here. +# If you want to be on this list, feel free send a PR +# to add yourself. +- jalf +- NTT corp. diff --git a/LICENSE.txt b/LICENSE.txt index 8051cea..a085195 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,5 @@ -noVNC is Copyright (C) 2011 Joel Martin +noVNC is Copyright (C) 2018 The noVNC Authors +(https://github.com/novnc/noVNC/blob/master/AUTHORS) The noVNC core library files are licensed under the MPL 2.0 (Mozilla Public License 2.0). The noVNC core library is composed of the diff --git a/README.md b/README.md index df8c797..09bff7d 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,9 @@ or deploying the noVNC application in production environments: ### Authors/Contributors +See [AUTHORS](AUTHORS) for a (full-ish) list of authors. If you're not on +that list and you think you should be, feel free to send a PR to fix that. + * Core team: * [Joel Martin](https://github.com/kanaka) * [Samuel Mannehed](https://github.com/samhed) (Cendio) diff --git a/app/localization.js b/app/localization.js index 90a98d4..100901c 100644 --- a/app/localization.js +++ b/app/localization.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/app/styles/base.css b/app/styles/base.css index 344db9b..3ca9894 100644 --- a/app/styles/base.css +++ b/app/styles/base.css @@ -1,8 +1,6 @@ /* * noVNC base CSS - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2016 Samuel Mannehed for Cendio AB - * Copyright (C) 2016 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * noVNC is licensed under the MPL 2.0 (see LICENSE.txt) * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). */ diff --git a/app/ui.js b/app/ui.js index b40b6b9..c6d36e2 100644 --- a/app/ui.js +++ b/app/ui.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2016 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/app/webutil.js b/app/webutil.js index db76de6..922ddc1 100644 --- a/app/webutil.js +++ b/app/webutil.js @@ -1,7 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2013 NTT corp. + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/display.js b/core/display.js index 54c2c36..59ddb34 100644 --- a/core/display.js +++ b/core/display.js @@ -1,7 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2015 Samuel Mannehed for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/encodings.js b/core/encodings.js index 5a70e66..9fd38d5 100644 --- a/core/encodings.js +++ b/core/encodings.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/input/domkeytable.js b/core/input/domkeytable.js index fdac483..d2109f3 100644 --- a/core/input/domkeytable.js +++ b/core/input/domkeytable.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/input/fixedkeys.js b/core/input/fixedkeys.js index daf088e..4d09f2f 100644 --- a/core/input/fixedkeys.js +++ b/core/input/fixedkeys.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/input/keyboard.js b/core/input/keyboard.js index 55ce917..9dbc8d6 100644 --- a/core/input/keyboard.js +++ b/core/input/keyboard.js @@ -1,7 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2013 Samuel Mannehed for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/input/mouse.js b/core/input/mouse.js index 38112fd..c78f2ab 100644 --- a/core/input/mouse.js +++ b/core/input/mouse.js @@ -1,7 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2013 Samuel Mannehed for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/input/vkeys.js b/core/input/vkeys.js index 66bf32f..f84109b 100644 --- a/core/input/vkeys.js +++ b/core/input/vkeys.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/rfb.js b/core/rfb.js index d1fcd2b..ffdd9c0 100644 --- a/core/rfb.js +++ b/core/rfb.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/util/browser.js b/core/util/browser.js index 965ba3c..32e101e 100644 --- a/core/util/browser.js +++ b/core/util/browser.js @@ -1,7 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/util/cursor.js b/core/util/cursor.js index 95301b2..b032ab6 100644 --- a/core/util/cursor.js +++ b/core/util/cursor.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright 2018 Pierre Ossman for noVNC + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/util/events.js b/core/util/events.js index 4669aa4..f122279 100644 --- a/core/util/events.js +++ b/core/util/events.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/util/eventtarget.js b/core/util/eventtarget.js index 3e927f0..c541645 100644 --- a/core/util/eventtarget.js +++ b/core/util/eventtarget.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/util/logging.js b/core/util/logging.js index fb2d417..036a7dd 100644 --- a/core/util/logging.js +++ b/core/util/logging.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/util/polyfill.js b/core/util/polyfill.js index 3e9cbaa..648ceeb 100644 --- a/core/util/polyfill.js +++ b/core/util/polyfill.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright 2017 Pierre Ossman for noVNC + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ diff --git a/core/util/strings.js b/core/util/strings.js index 1af6c46..61f4f23 100644 --- a/core/util/strings.js +++ b/core/util/strings.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/core/websock.js b/core/websock.js index 9f09230..ab63a3a 100644 --- a/core/websock.js +++ b/core/websock.js @@ -1,6 +1,6 @@ /* * Websock: high-performance binary WebSockets - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * Websock is similar to the standard WebSocket object but with extra diff --git a/po/de.po b/po/de.po index ee69046..0c3fa0d 100644 --- a/po/de.po +++ b/po/de.po @@ -1,6 +1,6 @@ # German translations for noVNC package # German translation for noVNC. -# Copyright (C) 2016 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Loek Janssen , 2016. # diff --git a/po/el.po b/po/el.po index a981554..5213ae5 100644 --- a/po/el.po +++ b/po/el.po @@ -1,5 +1,5 @@ # Greek translations for noVNC package. -# Copyright (C) 2016 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Giannis Kosmas , 2016. # diff --git a/po/es.po b/po/es.po index b98e81e..e15655f 100644 --- a/po/es.po +++ b/po/es.po @@ -1,6 +1,6 @@ # Spanish translations for noVNC package # Traducciones al español para el paquete noVNC. -# Copyright (C) 2018 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Juanjo Diaz , 2018. # diff --git a/po/nl.po b/po/nl.po index bb77edc..410e620 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,6 +1,6 @@ # Dutch translations for noVNC package # Nederlandse vertalingen voor het pakket noVNC. -# Copyright (C) 2016 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Loek Janssen , 2016. # diff --git a/po/noVNC.pot b/po/noVNC.pot index 8f231b2..9b4c552 100644 --- a/po/noVNC.pot +++ b/po/noVNC.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Various Authors +# Copyright (C) YEAR The noVNC Authors # This file is distributed under the same license as the noVNC package. # FIRST AUTHOR , YEAR. # diff --git a/po/pl.po b/po/pl.po index 7688172..5acfdc4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,5 +1,5 @@ # Polish translations for noVNC package. -# Copyright (C) 2017 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Mariusz Jamro , 2017. # diff --git a/po/po2js b/po/po2js index 6531716..03c1490 100755 --- a/po/po2js +++ b/po/po2js @@ -1,7 +1,7 @@ #!/usr/bin/env node /* * ps2js: gettext .po to noVNC .js converter - * Copyright (C) 2016 Pierre Ossman + * Copyright (C) 2018 The noVNC Authors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/po/sv.po b/po/sv.po index ad4d61b..6111fdd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,6 +1,6 @@ # Swedish translations for noVNC package # Svenska översättningar för paket noVNC. -# Copyright (C) 2016 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Samuel Mannehed , 2016. # diff --git a/po/tr.po b/po/tr.po index fdf3ba8..8b5c181 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,6 +1,6 @@ # Turkish translations for noVNC package # Turkish translation for noVNC. -# Copyright (C) 2016 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Ömer ÇAKMAK , 2018. # diff --git a/po/xgettext-html b/po/xgettext-html index 407477b..547f568 100755 --- a/po/xgettext-html +++ b/po/xgettext-html @@ -1,7 +1,7 @@ #!/usr/bin/env node /* * xgettext-html: HTML gettext parser - * Copyright (C) 2016 Pierre Ossman + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) */ diff --git a/po/zh_CN.po b/po/zh_CN.po index b5e8a54..78bfb95 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,5 +1,5 @@ # Simplified Chinese translations for noVNC package. -# Copyright (C) 2018 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Peter Dave Hello , 2018. # diff --git a/po/zh_TW.po b/po/zh_TW.po index e01d59d..9ddf550 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,5 +1,5 @@ # Traditional Chinese translations for noVNC package. -# Copyright (C) 2018 Various Authors +# Copyright (C) 2018 The noVNC Authors # This file is distributed under the same license as the noVNC package. # Peter Dave Hello , 2018. # diff --git a/tests/playback.js b/tests/playback.js index 5c2c29d..acaef74 100644 --- a/tests/playback.js +++ b/tests/playback.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) */ diff --git a/utils/genkeysymdef.js b/utils/genkeysymdef.js index d29cc2c..d21773f 100755 --- a/utils/genkeysymdef.js +++ b/utils/genkeysymdef.js @@ -1,8 +1,7 @@ #!/usr/bin/env node /* * genkeysymdef: X11 keysymdef.h to JavaScript converter - * Copyright 2013 jalf - * Copyright 2017 Pierre Ossman for Cendio AB + * Copyright (C) 2018 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) */ diff --git a/utils/img2js.py b/utils/img2js.py index 4d21342..ceab6bf 100755 --- a/utils/img2js.py +++ b/utils/img2js.py @@ -2,7 +2,7 @@ # # Convert image to Javascript compatible base64 Data URI -# Copyright 2011 Joel Martin +# Copyright (C) 2018 The noVNC Authors # Licensed under MPL 2.0 (see docs/LICENSE.MPL-2.0) # diff --git a/utils/json2graph.py b/utils/json2graph.py index 8992382..bdaeecc 100755 --- a/utils/json2graph.py +++ b/utils/json2graph.py @@ -2,7 +2,7 @@ ''' Use matplotlib to generate performance charts -Copyright 2011 Joel Martin +Copyright (C) 2018 The noVNC Authors Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0) ''' diff --git a/utils/launch.sh b/utils/launch.sh index ee2ca5e..162607e 100755 --- a/utils/launch.sh +++ b/utils/launch.sh @@ -1,7 +1,6 @@ #!/usr/bin/env bash -# Copyright 2016 Joel Martin -# Copyright 2016 Solly Ross +# Copyright (C) 2018 The noVNC Authors # Licensed under MPL 2.0 or any later version (see LICENSE.txt) usage() { diff --git a/vnc.html b/vnc.html index d00eec3..dc608a2 100644 --- a/vnc.html +++ b/vnc.html @@ -4,9 +4,7 @@