diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 39dd6514fac..ad71fd03376 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -22,45 +22,46 @@ This project incorporates components from the projects listed below. The origina 15. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped) 16. demyte/language-cshtml (https://github.com/demyte/language-cshtml) 17. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage) -18. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift) -19. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/) -20. Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site) -21. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar) -22. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify) -23. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert) -24. language-docker (https://github.com/moby/moby) -25. language-go version 0.39.0 (https://github.com/atom/language-go) -26. language-less (https://github.com/atom/language-less) -27. language-php (https://github.com/atom/language-php) -28. language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust) -29. MagicStack/MagicPython (https://github.com/MagicStack/MagicPython) -30. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage) -31. octicons-code version 3.1.0 (https://octicons.github.com) -32. octicons-font version 3.1.0 (https://octicons.github.com) -33. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui) -34. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage) -35. string_scorer version 0.1.20 (https://github.com/joshaven/string_score) -36. sublimehq/Packages (https://github.com/sublimehq/Packages) -37. SublimeText/PowerShell (https://github.com/SublimeText/PowerShell) -38. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle) -39. textmate/c.tmbundle (https://github.com/textmate/c.tmbundle) -40. textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle) -41. textmate/git.tmbundle (https://github.com/textmate/git.tmbundle) -42. textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle) -43. textmate/html.tmbundle (https://github.com/textmate/html.tmbundle) -44. textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle) -45. textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle) -46. textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle) -47. textmate/make.tmbundle (https://github.com/textmate/make.tmbundle) -48. textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle) -49. textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle) -50. textmate/r.tmbundle (https://github.com/textmate/r.tmbundle) -51. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle) -52. textmate/shellscript.tmbundle (https://github.com/textmate/shellscript.tmbundle) -53. textmate/sql.tmbundle (https://github.com/textmate/sql.tmbundle) -54. textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle) -55. TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage) -56. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift) +18. expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation) +19. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift) +20. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/) +21. Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site) +22. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar) +23. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify) +24. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert) +25. language-docker (https://github.com/moby/moby) +26. language-go version 0.39.0 (https://github.com/atom/language-go) +27. language-less (https://github.com/atom/language-less) +28. language-php (https://github.com/atom/language-php) +29. language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust) +30. MagicStack/MagicPython (https://github.com/MagicStack/MagicPython) +31. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage) +32. octicons-code version 3.1.0 (https://octicons.github.com) +33. octicons-font version 3.1.0 (https://octicons.github.com) +34. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui) +35. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage) +36. string_scorer version 0.1.20 (https://github.com/joshaven/string_score) +37. sublimehq/Packages (https://github.com/sublimehq/Packages) +38. SublimeText/PowerShell (https://github.com/SublimeText/PowerShell) +39. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle) +40. textmate/c.tmbundle (https://github.com/textmate/c.tmbundle) +41. textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle) +42. textmate/git.tmbundle (https://github.com/textmate/git.tmbundle) +43. textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle) +44. textmate/html.tmbundle (https://github.com/textmate/html.tmbundle) +45. textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle) +46. textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle) +47. textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle) +48. textmate/make.tmbundle (https://github.com/textmate/make.tmbundle) +49. textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle) +50. textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle) +51. textmate/r.tmbundle (https://github.com/textmate/r.tmbundle) +52. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle) +53. textmate/shellscript.tmbundle (https://github.com/textmate/shellscript.tmbundle) +54. textmate/sql.tmbundle (https://github.com/textmate/sql.tmbundle) +55. textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle) +56. TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage) +57. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift) %% atom/language-c NOTICES AND INFORMATION BEGIN HERE @@ -608,6 +609,32 @@ SOFTWARE. ========================================= END OF dotnet/csharp-tmLanguage NOTICES AND INFORMATION +%% expand-abbreviation NOTICES AND INFORMATION BEGIN HERE +========================================= +MIT License + +Copyright (c) 2017 Emmet.io + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +========================================= +END OF expand-abbreviation NOTICES AND INFORMATION + %% freebroccolo/atom-language-swift NOTICES AND INFORMATION BEGIN HERE ========================================= The MIT License (MIT) diff --git a/extensions/css/OSSREADME.json b/extensions/css/OSSREADME.json index a5bb212fc77..bcde278a960 100644 --- a/extensions/css/OSSREADME.json +++ b/extensions/css/OSSREADME.json @@ -6,4 +6,32 @@ "repositoryURL": "https://github.com/atom/language-css", "description": "The file syntaxes/css.tmLanguage.json was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle." -}] +}, +{ + "isLicense": true, + "name": "color-convert", + "repositoryURL": "https+ssh://git@github.com/harthur/color-convert", + "license": "MIT", + "licenseDetail": [ + "Copyright (c) 2011-2016 Heather Arthur ", + "", + "Permission is hereby granted, free of charge, to any person obtaining", + "a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including", + "without limitation the rights to use, copy, modify, merge, publish,", + "distribute, sublicense, and/or sell copies of the Software, and to", + "permit persons to whom the Software is furnished to do so, subject to", + "the following conditions:", + "", + "The above copyright notice and this permission notice shall be", + "included in all copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,", + "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF", + "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND", + "NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE", + "LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION", + "OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION", + "WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] +} +] diff --git a/extensions/json/OSSREADME.json b/extensions/json/OSSREADME.json index 5dfffd17073..2cb025220a0 100644 --- a/extensions/json/OSSREADME.json +++ b/extensions/json/OSSREADME.json @@ -3,5 +3,28 @@ "name": "Benvie/JavaScriptNext.tmLanguage", "version": "0.0.0", "license": "MIT", - "repositoryURL": "https://github.com/Benvie/JavaScriptNext.tmLanguage" + "repositoryURL": "https://github.com/Benvie/JavaScriptNext.tmLanguage", + "licenseDetail": [ + "The MIT License (MIT)", + "", + "Copyright (c) 2015 simonzack, zertosh, benvie", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE." + ] }] \ No newline at end of file diff --git a/package.json b/package.json index c9dec43802c..4bb04934c67 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "code-oss-dev", "version": "1.15.0", "electronVersion": "1.6.6", - "distro": "4bec0ed99ee450bfbefa4baf2433c6a032e88bd4", + "distro": "6655cfcefb1cd4a4d5afe63c1e99d492519e1b93", "author": { "name": "Microsoft Corporation" },