-
Notifications
You must be signed in to change notification settings - Fork 545
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
Move in changes for 1.2.4 release #3565
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* made parse context not static; need to fix the internal id being null when showcard is parsed * adding missing file * add parse context for property parsing * work in progress * fixes concurrency issue during parsing * minor fix * updated PR per CR comments
* addressed the review comments * review comments fixes
…p from… (#3526) * Added Custom Parsing and allowed signal to be passed to host app from custom action in SelectAction * updated with CR fixes * fixed for CR comments * addresssing CR comments
…ility (#3514) * [iOS][Sample App]Updated custom image renderer to handle toggle visiblity * toggle visibilty delegate will call action delegate to notify view frame changes
#3498) * [iOS] allows default text renderers to be used in their custom versions of renderer * adding missing files * fixed project file removal by tools (xcode, git, and etc) * CR comments feedback reflection * CR comments fix
RebeccaAnne
reviewed
Nov 4, 2019
This reverts commit 3ca37b1 which introduced an unexpected breaking change in the patch-only 1.2 branch release train with 1.2.3
…AdaptiveCards into paulcam/release-1.2.4
jwoo-msft
reviewed
Nov 4, 2019
source/dotnet/Library/AdaptiveCards/AdaptiveInlinesConverter.cs
Outdated
Show resolved
Hide resolved
jwoo-msft
approved these changes
Nov 4, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good on ios & .net (concurrent changes) |
shalinijoshi19
approved these changes
Nov 4, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RebeccaAnne
approved these changes
Nov 4, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Important
This PR is intended to supercede #3561. It was necessary to rework the code changes to avoid an unfortunate UWP conflict.
Many thanks to @RebeccaAnne for helping get this pulled together! 👍
Description
Cherry-pick changes for v1.2.4
How Verified
TBD
Microsoft Reviewers: Open in CodeFlow