Merge branch 'master' into jupyterlab_update

Author: jahn96

LICENSE

@@ -1,3 +1,37 @@
+BSD 3-Clause License
+
+Copyright (c) 2020, jupytercalpoly
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----------------------------------------------------------------------------------------------------------------
+Some lines of code in this extension are from Elyra's code snippet extension (https://github.com/elyra-ai/elyra).
+-----------------------------------------------------------------------------------------------------------------
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,7 +233,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-------------------------------------------------------------------------------------
-This extension is derived from Elyra's code snippet design (https://github.com/elyra-ai/elyra).
-------------------------------------------------------------------------------------

src/CodeSnippetContentsService.ts

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { ContentsManager, Drive, Contents } from '@jupyterlab/services';
 
 export interface ICodeSnippet {

src/CodeSnippetDisplay.tsx

@@ -1,3 +1,20 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
+// Some lines of code are from Elyra Code Snippet.
+
+/*
+ * Copyright 2018-2020 IBM Corporation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions a* limitations under the License.
+ */
+
 import { Clipboard, Dialog, showDialog } from '@jupyterlab/apputils';
 import { PathExt } from '@jupyterlab/coreutils';
 import { DocumentWidget } from '@jupyterlab/docregistry';

src/CodeSnippetEditor.tsx

@@ -1,3 +1,20 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
+// Some lines of code are from Elyra Code Snippet.
+
+/*
+ * Copyright 2018-2020 IBM Corporation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions a* limitations under the License.
+ */
+
 import { CodeEditor, IEditorServices } from '@jupyterlab/codeeditor';
 import {
   ReactWidget,

src/CodeSnippetEditorTags.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { checkIcon, addIcon } from '@jupyterlab/ui-components';
 
 import React from 'react';

src/CodeSnippetForm.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { closeIcon, Button, LabIcon } from '@jupyterlab/ui-components';
 import { WidgetTracker, ReactWidget, Styling } from '@jupyterlab/apputils';
 

src/CodeSnippetInputDialog.ts

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { showDialog, Dialog } from '@jupyterlab/apputils';
 import { addIcon, checkIcon } from '@jupyterlab/ui-components';
 import { Contents } from '@jupyterlab/services';

src/CodeSnippetLanguages.ts

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { LabIcon } from '@jupyterlab/ui-components';
 
 import babelSVGstr from '../style/icon/language_icons/babel.svg';

src/CodeSnippetWidget.tsx

@@ -1,3 +1,20 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
+// Some lines of code are from Elyra Code Snippet.
+
+/*
+ * Copyright 2018-2020 IBM Corporation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions a* limitations under the License.
+ */
+
 import { ReactWidget, UseSignal } from '@jupyterlab/apputils';
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import { IEditorServices } from '@jupyterlab/codeeditor';

src/CodeSnippetWidgetModel.ts

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import {
   ICodeSnippet,
   CodeSnippetContentsService

src/ConfirmMessage.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { WidgetTracker, ReactWidget } from '@jupyterlab/apputils';
 
 import { Widget, PanelLayout, Panel } from '@lumino/widgets';

src/FilterTools.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { InputGroup, checkIcon } from '@jupyterlab/ui-components';
 
 import React from 'react';

src/MoreOptions.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { WidgetTracker, ReactWidget } from '@jupyterlab/apputils';
 
 import { Widget, PanelLayout, Panel } from '@lumino/widgets';

src/PreviewSnippet.tsx

@@ -1,3 +1,6 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
 import { WidgetTracker, ReactWidget } from '@jupyterlab/apputils';
 import { CodeEditor, IEditorServices } from '@jupyterlab/codeeditor';
 

src/index.ts

@@ -1,3 +1,20 @@
+// Copyright (c) 2020, jupytercalpoly
+// Distributed under the terms of the BSD-3 Clause License.
+
+// Some lines of code are from Elyra Code Snippet.
+
+/*
+ * Copyright 2018-2020 IBM Corporation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions a* limitations under the License.
+ */
+
 import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin,

style/index.css

@@ -1 +1 @@
-@import url('base.css');
+@import url('base.css');