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

Timestamp #2

Merged
merged 2 commits into from
Jul 29, 2016
Merged

Timestamp #2

merged 2 commits into from
Jul 29, 2016

Conversation

billba
Copy link
Member

@billba billba commented Jul 29, 2016

No description provided.

@billba billba merged commit e9cb58d into master Jul 29, 2016
@billba billba deleted the timestamp branch July 29, 2016 15:03
danmarshall pushed a commit that referenced this pull request Jun 15, 2017
* receipt card test

Adding support for receipt card

* Recept Card in version 0.5

Recept Card in version 0.5

* load adaptivecards hostconfig from json file, webpacked into bundle (#495)

* remove Action.Http from cards

* corrected alpha channel colors

* add AdaptiveCards.md

* rename to Bot Builder SDK

* change SDK to Bot Builder SDK

* fix typos

* elsewhere

* lowercase titles

* added 'it'

* separates to separate

* handle undefined

* imBack for string

* Small language tweaks (#503)

* Adaptivecards (#505)

* edits from feedback

* moved Action.Http
danmarshall added a commit that referenced this pull request Jun 20, 2017
* Adaptive receipt (#2)

* receipt card test

Adding support for receipt card

* Recept Card in version 0.5

Recept Card in version 0.5

* load adaptivecards hostconfig from json file, webpacked into bundle (#495)

* remove Action.Http from cards

* corrected alpha channel colors

* add AdaptiveCards.md

* rename to Bot Builder SDK

* change SDK to Bot Builder SDK

* fix typos

* elsewhere

* lowercase titles

* added 'it'

* separates to separate

* handle undefined

* imBack for string

* Small language tweaks (#503)

* Adaptivecards (#505)

* edits from feedback

* moved Action.Http

* readme.md (#491)

updated version of readme.md

* edited test/README.md (#510)

* edited test/README.md

* Update README.md

* error handling

Adding SVG to represent the error occures in the JSON parsing or
adaptive card missing properties.

* Revert "error handling"

This reverts commit 92a4d27.

* error handling for ac

1. using this.forceUPdate()
2. svg error message

* minior fixes

* use state for error rendering

* change forceUpdate() to setState()

change forceUpdate() to setState()

* merge

* fix minor bug in ac tests

* add style to error

* latest AdaptiveCards lib

* remove 'lighter' text

* reformatted

* explicit if statement

* catch hyperlink clicks
danmarshall added a commit that referenced this pull request Jun 20, 2017
* add adaptive cards

* build adaptive card config

* add microsoft-adaptivecards-scss-to-json

* use AdaptiveCard builder

* use Adaptive Carrds for thumbnail, audio & video

* fix TS 2.3 TSX compiler errors

* remove adaptive-hostconfig.js

* add settings.scss, handle quoted values

* use adaptiveCard for receipt

* fix card padding

* use SCSS settings

* consolidate CSS build

* remove old file

* catch render errors

* add note

* handle nullref on attachment.content.images

* handle card padding

* load adaptivecards hostconfig from json file, webpacked into bundle (#495)

* remove Action.Http from cards

* corrected alpha channel colors

* add AdaptiveCards.md

* rename to Bot Builder SDK

* change SDK to Bot Builder SDK

* fix typos

* elsewhere

* lowercase titles

* added 'it'

* separates to separate

* handle undefined

* imBack for string

* Small language tweaks (#503)

* Adaptivecards (#505)

* edits from feedback

* moved Action.Http

* adaptive cards tests (#507)

Enable adaptive cards tests

* Adaptive receipt (#2) (#509)

* receipt card test

Adding support for receipt card

* Recept Card in version 0.5

Recept Card in version 0.5

* load adaptivecards hostconfig from json file, webpacked into bundle (#495)

* remove Action.Http from cards

* corrected alpha channel colors

* add AdaptiveCards.md

* rename to Bot Builder SDK

* change SDK to Bot Builder SDK

* fix typos

* elsewhere

* lowercase titles

* added 'it'

* separates to separate

* handle undefined

* imBack for string

* Small language tweaks (#503)

* Adaptivecards (#505)

* edits from feedback

* moved Action.Http

* copy editing (#512)

* eliminate webpack warnings

* added section to embed without webpack

* Adaptivecards error handling (#518)

* Adaptive receipt (#2)

* receipt card test

Adding support for receipt card

* Recept Card in version 0.5

Recept Card in version 0.5

* load adaptivecards hostconfig from json file, webpacked into bundle (#495)

* remove Action.Http from cards

* corrected alpha channel colors

* add AdaptiveCards.md

* rename to Bot Builder SDK

* change SDK to Bot Builder SDK

* fix typos

* elsewhere

* lowercase titles

* added 'it'

* separates to separate

* handle undefined

* imBack for string

* Small language tweaks (#503)

* Adaptivecards (#505)

* edits from feedback

* moved Action.Http

* readme.md (#491)

updated version of readme.md

* edited test/README.md (#510)

* edited test/README.md

* Update README.md

* error handling

Adding SVG to represent the error occures in the JSON parsing or
adaptive card missing properties.

* Revert "error handling"

This reverts commit 92a4d27.

* error handling for ac

1. using this.forceUPdate()
2. svg error message

* minior fixes

* use state for error rendering

* change forceUpdate() to setState()

change forceUpdate() to setState()

* merge

* fix minor bug in ac tests

* add style to error

* latest AdaptiveCards lib

* remove 'lighter' text

* reformatted

* explicit if statement

* catch hyperlink clicks

* remove blank line

* handle high dpi in hscroll button  management

* allow more time for hscroll

* use common adaptiveCardsFn

* case sensitive card names

* add note about channel limitations

* flattened carriage returns

* flattened carriage returns

* flattened carriage returns

* use const when possible

* whitespace cleanup
BruceHaley pushed a commit that referenced this pull request Jun 19, 2019
OEvgeny pushed a commit to OEvgeny/BotFramework-WebChat that referenced this pull request Oct 23, 2024
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.

1 participant