This repository was archived by the owner on Jun 30, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 528
added sound effects feature and open apps via message #1687
Merged
Conversation
This file contains hidden or 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
https://github.com/microsoft/botframework-solutions into microsoft-master # Conflicts: # solutions/android/VirtualAssistantClient/app/build.gradle # solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/MainActivity.java # solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/SpeechService.java # solutions/android/VirtualAssistantClient/app/src/main/res/values/strings.xml
latest upstream updates
pulling latest from upstream
latest upstream updates
latest upstream changes
grabbing latest changes
latest updates from upstream
* Added initial readme for Android Assistant app (#1667) * Virtual Assistant Client for Android - initial public commit * updated .gitignore to ensure the /src/debug folder is not ignored * implemented feedback from PR 1493 * code cleanup after merge * fixes possible exception due to race condition * fix: release created and stopped audio records * added timeout event so that client app can notify user * WIP adaptive card click events * WIP adaptive card clicking * finished implementation of adaptive card clicking * Updated Location event so that the data is consumed properly * additional IPA -> VA changes * logcat logging of complete JSON data * using suggested actions for adaptive card click * undo incorrect commit * added suggested actions feature * updates to allow the service to receive connections from other apps * small code updates + locationProvider threading fix * finished feature to broadcast data to other apps * added initial readme for Android app * Update readme.md * [Botskills] Add a new Known Issue of the CLI tool (#1665) * Adapt luisgen commands to trailing backslashs * Add issue in KnownIssues doc * Add an example of the issue * [DevOps] Disable builds in pull-request by default (#1661) * Update YAML files in TypeScript and Csharp * Update readme in both versions * Minor changes in YAML files * Minor changes in readme files * Updated default comment with sections for bots/deployment scripts (#1669) * News skill: adding trending articles, favorite topics, searching by market, searching by website (#1660) * Added trending articles, changing search market, search specific sites, choosing favorite topics * Changes from comments * fis newsLuis * update publish scripts to fix skill deployment filenotfound issues with kudu (#1668) * Create release-drafter.yml * [TypeScript][Virtual Assistant/Skill samples] Migrate from TSLint to ESLint (#1673) * Add ESLint to sample assistant * Fix ESLint issues in sample-assistant * Add ESLint to sample skill * Fix ESLint issues in sample-skill * Update dependencies * Update templates * Update generator
darrenj
approved these changes
Jun 28, 2019
lzc850612
approved these changes
Jul 1, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Purpose
fixes #1684 and #1497