Skip to content

[TS] Template engine and integration into Designer - #2355

Closed
David Claux (dclaux) wants to merge 131 commits into
masterfrom
js/template-engine
Closed

David Claux (dclaux) wants to merge 131 commits into
masterfrom
js/template-engine

Conversation

@dclaux

Copy link
Copy Markdown
Member

This is not finished, but is functional enough to start testing.

David Claux (dclaux) and others added 30 commits January 17, 2019 10:05
A couple features still missing
[Designer] Minor bug fixes
[Designer] Minor cosmetic changes
Add $data property to CardElement and Action
Add sample data JSON editor toolbox (work in progress)
[Designer] Add CardDesigner.dataStructure property
[Designer] Small cosmetic updates
Add support for JSON.parse as a function
"type": "Image",
"backgroundColor": "#183774",
"url": "http://adaptivecards.io/content/cats/1.png"
}]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey David Claux (@dclaux), are the changes to teh test samples related to your changes at all? My only concern is a bad merge accidentally overwriting stuff in master for 1.2 ..

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember making any changes here.

../../shared/cpp/ObjectModel/ToggleVisibilityAction.cpp
../../shared/cpp/ObjectModel/ToggleVisibilityTarget.cpp
../../shared/cpp/ObjectModel/UnknownElement.cpp
../../shared/cpp/ObjectModel/UnknownAction.cpp

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this by design ? This may be a bad merge conflict change?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I never made this change.

@dclaux

Copy link
Copy Markdown
Member Author

Closing this PR. All the relevant changes are now in this PR: #2995

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants