Merge branch 'master' into portals-1820794

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -1904,6 +1904,11 @@
       "source_path": "powerapps-docs/maker/common-data-service/entity-relationship-behavior.md",
       "redirect_url": "create-edit-entity-relationships#entity-relationship-behavior",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "powerapps-docs/maker/canvas-apps/embed-teams-app.md",
+      "redirect_url": "/powerapps/teams/embed-teams-app",
+      "redirect_document_id": false
     }
   ]
 }

powerapps-docs/developer/component-framework/reference/navigation/openform.md

@@ -29,7 +29,7 @@ Model-driven apps
 
 | Parameter Name|Type|Required|Description|
 | ------------- |----|--------|-----------|
-|options|`EntityFormOptions`|Yes|Entity form options for opening the form. The EntityFormOptions has the following attributes:<br/>- **createFromEntity**: `Lookup`. Designates a record that will provide default values based on mapped attribute values. The lookup object has the following String properties: `entityType`, `id`, and `name`. <br/>- **entityId**: `String`. ID of the entity record to display the form for.<br/>- **entityName**: `String`. Logical name of the entity to display the form for.<br/>- **formId**: `String`. ID of the form instance to be displayed.<br/>- **height**: `Number`. Height of the form window to be displayed in pixels.<br/>- **openInNewWindow**: `boolean`. whether to display form in a new window.<br/>- **useQuickCreateForm**: `Boolean`. whether to open a quick create form. If you do not specify this, by default `false` is passed.<br/>- **width**: `Number`. Width of the form window to be displayed in pixels.<br/>- **windowPosition**: `Number`. Specify one of the following values for the window position of the form on the screen: `1:center` <br/> `2:side`|
+|options|`EntityFormOptions`|Yes|Entity form options for opening the form. The EntityFormOptions has the following attributes:<br/>- **createFromEntity**: `Lookup`. Designates a record that will provide default values based on mapped attribute values. The lookup object has the following String properties: `entityType`, `id`, and `name`. <br/>- **entityId**: `String`. ID of the entity record to display the form for.<br/>- **entityName**: `String`. Logical name of the entity to display the form for.<br/>- **formId**: `String`. ID of the form instance to be displayed.<br/>- **height**: `Number`. Height of the form window to be displayed in pixels.<br/>- **openInNewWindow**: `boolean`. whether to display form in a new window or a new tab. If you specify `true` and do not specify values for height or width, the form will display in a new tab. <br/>- **useQuickCreateForm**: `Boolean`. whether to open a quick create form. If you do not specify this, by default `false` is passed.<br/>- **width**: `Number`. Width of the form window to be displayed in pixels.<br/>- **windowPosition**: `Number`. Specify one of the following values for the window position of the form on the screen: `1:center` <br/> `2:side`|
 |parameters|`Object`|No|An dictionary object that passes extra parameters to the form. Invalid parameters will cause an error. More information [see field values using parameters passed to a form](https://docs.microsoft.com/powerapps/developer/model-driven-apps/set-field-values-using-parameters-passed-form) and [Configure a form to accept custom query string parameters](https://docs.microsoft.com/powerapps/developer/component-framework/sample-controls/navigation-api-control)|
 
 ## Return Value
@@ -44,4 +44,4 @@ See [Promise](https://developer.mozilla.org/docs/Web/JavaScript/reference/Global
 
 [Navigation](../navigation.md)<br/>
 [Power Apps component framework API reference](../../reference/index.md)<br/>
-[Power Apps component framework overview](../../overview.md)
+[Power Apps component framework overview](../../overview.md)

powerapps-docs/index.yml

@@ -12,7 +12,7 @@ metadata:
   ms.topic: hub-page # Required
   author: KumarVivek #Required; your GitHub user alias, with correct capitalization.
   ms.author: kvivek #Required; microsoft alias of author; optional team alias.
-  ms.date: 09/13/2020 #Required; mm/dd/yyyy format.
+  ms.date: 09/22/2020 #Required; mm/dd/yyyy format.
   hide_bc: false
 
 
@@ -81,6 +81,18 @@ conceptualContent:
         url: /powerapps/maker/common-data-service
         text: More
 
+    - title: Integrate with Microsoft Teams
+      links:
+        - text: Embed a canvas app in Teams
+          url: /powerapps/teams/embed-teams-app
+          itemType: overview
+        - text: Create apps in Teams
+          url: /powerapps/teams/create-apps-overview
+          itemType: overview
+        - text: What is Project Oakdale?
+          url: /powerapps/teams/overview-data-platform
+          itemType: overview
+
     - title: Use solutions for ALM
       links:
         - text: What are solutions?

powerapps-docs/maker/TOC.yml

@@ -880,9 +880,7 @@
     - name: Share app resources
       href: ./canvas-apps/share-app-resources.md
     - name: Embed an app in Power BI
-      href: ./canvas-apps/embed-powerapps-powerbi.md
-    - name: Embed an app in Teams
-      href: ./canvas-apps/embed-teams-app.md
+      href: ./canvas-apps/embed-powerapps-powerbi.md    
   - name: Manage an app
     items:
     - name: Edit an app
@@ -1777,8 +1775,74 @@
   - name: For developers
     href: ../developer/common-data-service/overview.md
     # href: ../developer/common-data-service/TOC.yml  changing this to have developer TOC rather than buried in maker toc
+
+- name: Teams integration
+  items:
+  - name: Overview
+    href: ../teams/overview.md
+  - name: Embed a canvas app as tab app
+    href: ../teams/embed-teams-tab.md
+  - name: Embed a canvas app as personal app
+    href: ../teams/embed-teams-app.md
+  - name: Create apps in Teams (Preview)
+    items:
+    - name: Create apps in Teams
+      href: ../teams/create-apps-overview.md
+    - name: Get started
+      items:      
+        - name: Install the Power Apps personal app
+          href: ../teams/install-personal-app.md
+        - name: Create your first app
+          href: ../teams/create-first-app.md    
+    - name: Understand the Power Apps interface
+      items:
+        - name: Overview of the Power Apps app
+          href: ../teams/overview-of-the-power-apps-app.md
+        - name: Understand Power Apps Studio
+          href: ../teams/understand-power-apps-studio.md
+        - name: Use the Fluent UI controls
+          href: ../teams/use-the-fluent-ui-controls.md
+    - name: Create additional apps
+      href: ../teams/create-additional-apps.md
+    - name: Use Teams integration object
+      href: ../teams/use-teams-integration-object.md
+    - name: Work with Project Oakdale
+      items:
+        - name: Overview
+          href: ../teams/overview-data-platform.md
+        - name: Project Oakdale vs Common Data Service
+          href: ../teams/data-platform-compare.md
+        - name: Create a table
+          href: ../teams/create-table.md
+        - name: Edit or delete a table
+          href: ../teams/edit-delete-table.md
+        - name: Work with table relationships
+          href: ../teams/relationships-table.md
+        - name: Work with table columns
+          href: ../teams/table-columns.md
+    - name: Manage your apps
+      href: ../teams/manage-your-apps.md
+    - name: Share and publish your app
+      href: ../teams/publish-and-share-apps.md
+    - name: Remove your apps
+      href: ../teams/remove-your-apps.md
+    - name: Uninstall Power Apps personal app
+      href: ../teams/uninstall-personal-apps.md
+    - name: Sample apps
+      items:
+        - name: Use sample apps from Teams store
+          href: ../teams/use-sample-apps-from-teams-store.md
+        - name: Employee Ideas
+          href: ../teams/employee-ideas.md
+        - name: Inspection
+          href: ../teams/inspection.md
+        - name: Issue Reporting
+          href: ../teams/issue-reporting.md
+    - name: Known issues and limitations
+      href: ../teams/known-issues-limitations.md
 - name: Chatbots
   href: ../chatbots.md
+
 - name: AI Builder
   href: ../use-ai-builder.md
 - name: Sample apps and solutions

powerapps-docs/maker/index.md

@@ -6,7 +6,7 @@ manager: kvivek
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 06/16/2020
+ms.date: 09/22/2020
 ms.author: tapanm
 ms.reviewer:
 ---
@@ -22,6 +22,9 @@ Power Apps is a high-productivity development platform for business apps, and ha
 
 Let's learn more about each of these.
 
+> [!NOTE]
+> In addition to creating apps in Power Apps, you can now create apps directly within Microsoft Teams using Power Apps. More information: [Create apps in Microsoft Teams by using Power Apps](/powerapps/teams/create-apps-overview).
+
 ## Canvas apps
 
 [Canvas apps](canvas-apps/getting-started.md) start with your user experience, crafting a highly tailored interface with the power of a blank canvas and connecting it to your choice of more than 200 data sources. You can build canvas apps for web, mobile, and tablet applications.

powerapps-docs/maker/model-driven-apps/media/add-timeline-main-form.gif

@@ -8,8 +8,8 @@ ms.service: powerapps
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.topic: "article"
-author: "matp"
-ms.author: "Mattp123"
+author: "lerobbin"
+ms.author: "lerobbin"
 manager: "kvivek"
 tags: 
 search.audienceType: 
@@ -74,25 +74,27 @@ The following sections describe how to configure display options, advanced setti
 
    ![Records shown on page](media/timeline-records-shown-on-page-runtime.png "Records shown on page")
 
-- **Record types shown**: Select which record types you want to show in the timeline. Users will also be able to create new records of the record types you select here. You can select from: Activities, Notes, and Posts. All these are selected by default.
+- **Record types shown**: Select which record types you want to show in the timeline. Users will also be able to create new records of the record types you select here. You can select from: Activities and Notes. Both are selected by default.
 
     - **Activities**. There are multiple customizable activity types to support business needs. You can create, add, and display a number of different activity types under the **Activities** section of timeline properties.
       > [!IMPORTANT]
       > You only want to enable activities that you need on this form. When working with 10 or more **Activity types**, you will receive a warning that the number of activity types you have selected impacts the performance speed on the timeline. To improve timeline performance speed, consider limiting activity types to 10 or less. 
     - **Notes**. This allows users to capture notes related to the entity record. Notes are typically used to grab thoughts, summary information, and provide feedback on a record—for example, a contact.
-    - **Posts.**  There are two types of posts, Auto and User. 
-        - **Auto Posts**. These are system-generated and notify you of account activity that has occurred. 
-        - **User Posts**. These are used to communicate with other users in your organization.
+
+    > [!NOTE]
+    > If you have a Dynamics 365 customer engagement app, such as Dynamics 365 Field Service installed, **Posts** will be another record type available. There are two types of posts, Auto and User.
+    > - **Auto Posts**. These are system-generated and notify you of account activity that has occurred.
+    > - **User Posts**. These are used to communicate with other users in your organization.
 
     The following image shows that because you selected **Activities**, **Notes**, and **Posts** in the **Record types to show** section of timeline properties, users will see an option to create these record types at runtime. The records of these record types will also be shown in the timeline section at runtime.  
 
     ![Option to create the record types that are selected in timeline properties](media/timeline-record-type-to-show-runtime.png "Record types shown based on the record types selected in timeline properties")  
 
-    The timeline shows an icon before the activity, post, note, and custom entity making it easy for you to identify the record type. Dates and timestamps are shown for each activity, note, or post in the timeline. 
+    The timeline shows an icon before the activity, note, post, and custom entity making it easy for you to identify the record type. Dates and timestamps are shown for each activity, note, or post in the timeline. 
 
 ### Advanced section
 
-Expand the **Advanced** section in the **Timeline** **Properties** for settings that span an activity, note, or post, which are the three primary record types that appear in the timeline section. This section is collapsed by default. When you enable or disable settings in the advanced section, you won't be able to see the changes at runtime until you save and publish your changes and refresh the form's web browser page in the app.
+Expand the **Advanced** section in the **Timeline** **Properties** for settings that span an activity or note, which are the primary record types that appear in the timeline section. This section is collapsed by default. When you enable or disable settings in the advanced section, you won't be able to see the changes at runtime until you save and publish your changes and refresh the form's web browser page in the app.
 
 ![Advanced settings in Timeline properties](media/timeline-properties-advanced-section.png "Advanced settings in Timeline properties")
 
@@ -117,7 +119,7 @@ Expand the **Advanced** section in the **Timeline** **Properties** for settings
 
 ### Record settings section
 
-The **Record settings** section allows you to define detailed settings for the record types that you selected in the **Record types to show** setting. For example, if you selected check boxes for **Activities**, **Notes**, and **Posts** in the **Record types to show** section, the **Record settings** section will provide you with more settings related to these record types.
+The **Record settings** section allows you to define detailed settings for the record types that you selected in the **Record types to show** setting. For example, if you selected check boxes for **Activities** and **Notes** in the **Record types to show** section, the **Record settings** section will provide you with more settings related to those record types.
 
 #### Configure activity record types
 
@@ -154,7 +156,7 @@ After you select **Activities** in the **Records types to show** section, you ca
 
 ### Set date in the sort activities by feature in the timeline
 
-How you view data is important and setting a default display view of your data varies based on the needs of your business. Makers can choose how data is sorted and create a default sort setting for **Activity types** in **Record settings**. **Last Updated** is on all activities, which is why it is set as the default in ascending order.    
+How you view data is important and setting a default display view of your data varies based on the needs of your business. Makers can choose how data is sorted and create a default sort setting for **Activity types** in **Record settings**. **Last Updated** is on all activities, which is why it is set as the default in ascending order.
 
 1. The **Sort activities by** feature in the **Activities record settings** allows you to control how data is sorted in the timeline.  
 2. When you select the **Sort activities by** field, a list appears. You can select from this list how you want your data to be sorted and displayed on the timeline in the form.
@@ -197,7 +199,7 @@ All card forms are broken out into the following four sections:
 
 ![Advanced display options about how to customize a card form in the timeline](media/timeline-card-form-advanced-1.png "Advanced display options about how to customize a card form in the timeline")
 
-Each individual card form has to be customized for each activity record such as email, tasks, posts, and so on.
+Each individual card form has to be customized for each activity record such as email, tasks, and so on.
 
 **Header Section**<br>
 This displays the title/subject in your timeline email form. You can have up to six fields in the **Header** section. Only the first two fields will be seen on the timeline record. Also, empty fields will be ignored by the form in all sections.<br>