Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push live #311

Merged
merged 44 commits into from
Jul 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4fdb0eb
Update host-config.md (#248)
jwoo-msft Jan 21, 2020
ed6d16b
Update host-config.md (#248) (#249)
jwoo-msft Jan 22, 2020
c375098
Fix typo
matthidinger Jan 24, 2020
447ed64
Webex Team now supports 1.2. (#258)
urangasa Feb 18, 2020
1f930bd
Update partners.md
matthidinger Feb 18, 2020
928b70d
Fix typo (#257)
cwhitten Feb 18, 2020
a122a86
Update service.md (#252)
MarkMcGee1 Feb 18, 2020
58acd04
Update service.md
matthidinger Feb 18, 2020
bcabbb1
Update partners.md
matthidinger Feb 18, 2020
e5793ee
Update render-a-card.md (#239)
haldun Feb 18, 2020
d34110a
Update partners.md
matthidinger Feb 18, 2020
9dcc789
Updated note text - .NET version is available (#265)
billbliss Mar 27, 2020
2440cb5
Update Web Chat to 4.8.0 with AC 1.2.5 (#264)
compulim Mar 30, 2020
7043efc
typo, then > than (#263)
crowcoder Mar 30, 2020
be92f2d
C196067 - Converting plain-text link to MD syntax (#267)
V-vafune Apr 13, 2020
0a4a748
Update config to enable docfx v3 (#269)
Apr 16, 2020
04c0bb2
fix obsolete ctor
matthidinger May 7, 2020
dba19dd
Update variable name (#280)
tony-xia May 12, 2020
64d891f
Fixed minor typos (#279)
tony-xia May 12, 2020
109b411
Fixed a wrong spelling (#281)
tony-xia May 12, 2020
2789bf0
Updated iOS example (#283)
jwoo-msft May 14, 2020
71521ff
Updating Web Chat to 4.9.0 (#284)
compulim May 18, 2020
170f807
Update templating docs (#272)
matthidinger May 19, 2020
92b25bc
Merge branch 'live' into master
matthidinger May 19, 2020
716cd96
Update extensibility.md
matthidinger May 19, 2020
cdafc07
Update index.md
matthidinger May 19, 2020
e0d2261
Merge branch 'live' into master
matthidinger May 19, 2020
f56d32c
Push live (#287) (#288)
matthidinger May 19, 2020
ca7e2ee
Update sdk.md
matthidinger May 19, 2020
eb9c2ad
Update language.md
matthidinger May 19, 2020
c3cdf7d
Update host-config.md
matthidinger May 19, 2020
a8bc27c
CC191749 - Fixing Typo (#293)
V-vafune May 29, 2020
f744b9f
Update sdk.md
matthidinger Jun 2, 2020
f1dbc8e
Update sdk.md
matthidinger Jun 2, 2020
eb4a407
Update version number of Web Chat (#299)
compulim Jun 10, 2020
00e4849
added markdown clarification
matthidinger Jun 18, 2020
b267e55
change http to https (#303)
chenhao2020 Jul 8, 2020
06bdf78
Update outlook.md to fix a dead link (#297)
stevebeauge Jul 8, 2020
89ae069
Update Web Chat to 4.9.2 (#308)
compulim Jul 14, 2020
b8aa793
[Android] Action.ShowCard native styling (#310)
golddove Jul 16, 2020
027dfb9
Update JS extensibility doc to include 2.0 model (#298)
dclaux Jul 16, 2020
8cd10c0
fix link
matthidinger Jul 16, 2020
df4e5c1
Update sdk.md (#296)
jwoo-msft Jul 16, 2020
261d8c4
Added C# Code Exmaple (#307)
blueboxes Jul 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions AdaptiveCards/authoring-cards/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Actions add buttons to the card. These can perform a variety of actions, like op

## Learn More

* [Browse Sample cards](http://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](http://adaptivecards.io/explorer) to browse the available elements
* Build a card using the [Interactive Visualizer](http://adaptivecards.io/visualizer/)
* [Get in touch](http://adaptivecards.io/connect) with any feedback you have
* [Browse Sample cards](https://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](https://adaptivecards.io/explorer) to browse the available elements
* Build a card using the [Interactive Visualizer](https://adaptivecards.io/visualizer/)
* [Get in touch](https://adaptivecards.io/connect) with any feedback you have
15 changes: 10 additions & 5 deletions AdaptiveCards/authoring-cards/text-features.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@
title: Text Features
author: matthidinger
ms.author: mahiding
ms.date: 11/09/2017
ms.date: 06/18/2020
ms.topic: article
---

# Text features

`TextBlock` offers some advanced features for formatting and localizing the text.
[TextBlock](https://adaptivecards.io/explorer/TextBlock.html) offers advanced features for formatting and localizing the text.

## Markdown
To support inline markup, Adaptive Cards support a **subset** of Markdown syntax.
## Markdown (Commonmark subset)

To support inline markup, Adaptive Cards support a **subset** of the [Commonmark](https://commonmark.org/help/) Markdown syntax.

> [!NOTE]
>
> [RichTextBlock](https://adaptivecards.io/explorer/RichTextBlock.html) does not support markdown, but offers a wide array of text configuration options directly within the the [TextRun](https://adaptivecards.io/explorer/TextRun.html)

_Supported_

Expand Down Expand Up @@ -62,7 +67,7 @@ The below payload would render something like this:
},
{
"type": "TextBlock",
"text": "Check out [Adaptive Cards](http://adaptivecards.io)"
"text": "Check out [Adaptive Cards](https://adaptivecards.io)"
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions AdaptiveCards/getting-started/bots.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ You can:
* Add multiple types of `Actions`
* Collect `Input` from your users
* Have one card `show another card`
* [Check out the full schema explorer](http://adaptivecards.io/explorer/)!
* [Check out the full schema explorer](https://adaptivecards.io/explorer/)!

## Platform SDKs

Expand All @@ -123,7 +123,7 @@ The Bot Framework lets you publish your bot to multiple channels. We're working

We've just scratched the surface in this tutorial, so please take a look at the links below to explore more ways that Adaptive Cards can enhance your bot.

* [Browse Sample cards](http://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](http://adaptivecards.io/explorer) to learn the available elements
* Build a card using the [Interactive Visualizer](http://adaptivecards.io/visualizer/index.html?hostApp=Skype)
* [Get in touch](http://adaptivecards.io/connect) with any feedback you have
* [Browse Sample cards](https://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](https://adaptivecards.io/explorer) to learn the available elements
* Build a card using the [Interactive Visualizer](https://adaptivecards.io/visualizer/index.html?hostApp=Skype)
* [Get in touch](https://adaptivecards.io/connect) with any feedback you have
2 changes: 1 addition & 1 deletion AdaptiveCards/getting-started/outlook.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ You can now use Adaptive Cards to power your Outlook Actionable Messages, and cr

- Head over to https://docs.microsoft.com/outlook/actionable-messages/ which will guide you through the steps of creating your first Actionable Message scenario.
- Use the Actionable Message Card Playground tool to see card samples, create your own cards, send them to your own Office 365 account and see them in [Outlook for the Web](https://outlook.office.com).
- Would you rather not write JSON manually? The [Adaptive Card Designer (preview)](https://acdesignerbeta.azurewebsites.net) lets you create Adaptive Cards without writing a single line of JSON!
- Would you rather not write JSON manually? The [Adaptive Card Designer](https://adaptivecards.io/designer/) lets you create Adaptive Cards without writing a single line of JSON!
8 changes: 4 additions & 4 deletions AdaptiveCards/getting-started/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ We don't have anything to share just yet, but we're working on incorporating Ada

We've barely scratched the surface in this tutorial, so check back soon and browse the links below to explore more about Adaptive Cards.

* [Browse Sample cards](http://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](http://adaptivecards.io/explorer) to learn the available elements
* Build a card using the [Interactive Visualizer](http://adaptivecards.io/visualizer/index.html?hostApp=Skype)
* [Get in touch](http://adaptivecards.io/connect) with any feedback you have
* [Browse Sample cards](https://adaptivecards.io/samples/) for inspiration
* Use the [Schema Explorer](https://adaptivecards.io/explorer) to learn the available elements
* Build a card using the [Interactive Visualizer](https://adaptivecards.io/visualizer/index.html?hostApp=Skype)
* [Get in touch](https://adaptivecards.io/connect) with any feedback you have
2 changes: 1 addition & 1 deletion AdaptiveCards/rendering-cards/host-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ See a sample [HostConfig.json](https://github.com/Microsoft/AdaptiveCards/blob/m
* [`SpacingsConfig`](#schema-spacingsconfig) - Controls how elements are to be laid out
* [`TextBlockConfig`](#schema-textblockconfig) - Parameters controlling the display of text

# Card Configuration
## Card Configuration

<a name="schema-adaptivecardconfig"></a>
## AdaptiveCardConfig
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveCards/resources/partners.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you are interested in joining the Adaptive Cards ecosystem, please [reach out

Platform | Description | Documentation | Version
---------|-------------|---------------|---------
[Bot Framework Web Chat](https://github.com/Microsoft/BotFramework-WebChat) | Embeddable web chat control for the Microsoft Bot Framework | [Get Started](https://docs.microsoft.com/adaptive-cards/get-started/bots) | 1.2.5 (Web Chat 4.9.0)
[Bot Framework Web Chat](https://github.com/Microsoft/BotFramework-WebChat) | Embeddable web chat control for the Microsoft Bot Framework | [Get Started](https://docs.microsoft.com/adaptive-cards/get-started/bots) | 1.2.6 (Web Chat 4.9.2)
[Outlook Actionable Messages](https://docs.microsoft.com/outlook/actionable-messages/) | Attach an actionable message to email | [Get Started](https://docs.microsoft.com/outlook/actionable-messages/) | 1.0
[Microsoft Teams](https://products.office.com/microsoft-teams/group-chat-software) | Platform that combines workplace chat, meetings, and notes | [Get Started](https://docs.microsoft.com/microsoftteams/platform/concepts/cards/cards-reference#adaptive-card) | 1.2
[Cortana Skills](https://docs.microsoft.com/cortana/skills/adaptive-cards) | A virtual assistant for Windows 10 | [Get Started](https://docs.microsoft.com/adaptive-cards/get-started/bots) | 1.0
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveCards/resources/tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Check out the [adaptivecards-designer](https://npmjs.com/adaptivecards-designer)

Schema validation is a powerful way of making authoring easier and enabling tooling.

We have provided a complete [JSON Schema file](http://adaptivecards.io/schemas/1.2.0/adaptive-card.json) for editing and validating adaptive cards in json. Note that the schema URL is versioned, newer versions of Adaptive Cards will have a corresponding URL.
We have provided a complete [JSON Schema file](https://adaptivecards.io/schemas/1.2.0/adaptive-card.json) for editing and validating adaptive cards in json. Note that the schema URL is versioned, newer versions of Adaptive Cards will have a corresponding URL.

In Visual Studio and Visual Studio Code you can get automatic Intellisense by including a `$schema` reference.

Expand Down
2 changes: 1 addition & 1 deletion AdaptiveCards/sdk/rendering-cards/android/extensibility.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Android SDK
title: Android SDK Extensibility
author: almedina-ms
ms.author: almedina
ms.date: 09/27/2017
Expand Down
8 changes: 8 additions & 0 deletions AdaptiveCards/sdk/rendering-cards/android/native-styling.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,11 @@ Text inputs with an inline action allows styling for the action being rendered.

> [!IMPORTANT]
> All item names must be kept as shown here as the renderer looks for those exact names

## Action.ShowCard

Action.ShowCard can be styled by adding styles to your theme in styles.xml.

```styles.xml
<item name="adaptiveShowCardAction">@style/adaptiveShowCardAction</item>
```
Loading