Merge pull request #163 from TCourtneyOwen/merge-office-addin-taskpane

akrantz · web-flow · commit 10648e1fa871 · 2019-06-20T10:46:21.000-07:00
Merge office addin taskpane
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -58,24 +58,7 @@
       "url": "${input:officeOnlineDocumentUrl}",
       "webRoot": "${workspaceFolder}",
       "preLaunchTask": "Debug: Web"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Tests",
-      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-      "args": [
-        "-u",
-        "tdd",
-        "--timeout",
-        "999999",
-        "--colors",
-        "-r",
-        "ts-node/register",
-        "${workspaceFolder}/test/*.ts"
-      ],
-      "internalConsoleOptions": "openOnSessionStart",
-    },
+    }
   ],
   "inputs": [
     {
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/commands/commands.html b/src/commands/commands.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license in root of repo. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->
 
 <!DOCTYPE html>
 <html>
diff --git a/src/functions/functions.html b/src/functions/functions.html
@@ -1,3 +1,5 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->
+
 <!DOCTYPE html>
 <html>
 
diff --git a/src/taskpane/taskpane.html b/src/taskpane/taskpane.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license in root of repo. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->
 <!-- This file shows how to design a first-run page that provides a welcome screen to the user about the features of the add-in. -->
 
 <!DOCTYPE html>
diff --git a/test/src/test-helpers.ts b/test/src/test-helpers.ts
@@ -19,4 +19,4 @@ export function addTestResult(testValues: any[], resultName: string, resultValue
     data["resultName"] = resultName;
     data["resultValue"] = resultValue;
     testValues.push(data);
-}
+}
diff --git a/test/src/test-taskpane.html b/test/src/test-taskpane.html
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license in root of repo. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->
 <!-- This file shows how to design a first-run page that provides a welcome screen to the user about the features of the add-in. -->
 
 <!DOCTYPE html>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See full license in root of repo. -->`
	`1`	`+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->`
`2`	`2`
`3`	`3`	`<!DOCTYPE html>`
`4`	`4`	`<html>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. -->`
	`2`	`+`
`1`	`3`	`<!DOCTYPE html>`
`2`	`4`	`<html>`
`3`	`5`