Resolve syncing conflicts from live-sync-work to live#40

Merged

RobStand merged 63 commits intolivefrom

Aug 7, 2017

Commits on Jul 7, 2017

Commits on Jul 8, 2017

ISO 639-2 recommends use of the language codes in lower case (#175)

johnd-ms
authored and
RobStand
committed

Commits on Jul 14, 2017

Update bot-builder-dotnet-quickstart.md

brandonh-msft
authored and
RobStand
committed
Removing bad metadata (#183)
Kamran Iqbal
authored
Release 07-14-2017 (#184)
Kamran Iqbal
authored
Conversation designer (#178)

v-ducvo
authored and
Kamran Iqbal
committed
Conversation Designer going live (#188)
Kamran Iqbal
authored
requires (#186)

johnd-ms
authored and
RobStand
committed
Merge branch 'master' into live
RobStand
committed

Commits on Jul 20, 2017

Dialog next steps (#177)

v-ducvo
authored and
RobStand
committed
Release 7-20-2017
RobStand
authored
Sync for release
RobStand
committed
Subscribe to bot events, always show bot online (#189)

johnd-ms
authored and
Kamran Iqbal
committed
Changing author alias (#193)
RobStand
authored
links to best current samples, User Story 17067 (#185)

johnd-ms
authored and
Kamran Iqbal
committed
Second effort for PR181 (#187)

johnd-ms
authored and
Kamran Iqbal
committed
Groupme screencaps (#191)

johnd-ms
authored and
Kamran Iqbal
committed
Updates to Slack, GroupMe, sample links, next steps (#194)
Kamran Iqbal
authored

Commits on Jul 21, 2017

Fixed broken anchor links from table to section in topic. (#195)

v-ducvo
authored and
Kamran Iqbal
committed

Commits on Jul 26, 2017

Removing broken video
RobStand
committed

Commits on Jul 28, 2017

Update bot-builder-nodejs-cortana-skill.md
Kamran Iqbal
authored
Update bot-builder-nodejs-cortana-skill.md (#198)
Kamran Iqbal
authored
added dotnet scorable dialogs (#180)

matthewshim-ms
authored and
Kamran Iqbal
committed
Merge branch 'live' into master
Kamran Iqbal
authored
Update filenames.md
RobStand
authored

Commits on Jul 31, 2017

Added entries about the documentation (#206)
RobStand
authored

Commits on Aug 1, 2017

Slack review (#204)

johnd-ms
authored and
RobStand
committed
Scorable review (#203)

Kamran Iqbal
authored and
RobStand
committed
Grammar correction. Whose, not Who's (#33)

sitver
authored and
RobStand
committed
Updated to correct version of IISExpress (#35)

deankroker
authored and
RobStand
committed
Update resources-tools-downloads.md (#31)

mschray
authored and
RobStand
committed
Changed AttachmentLayouts to AttachmentLayoutTypes (#38)

peterkaplan
authored and
RobStand
committed
Release 08-01-2017 (#207)
RobStand
authored
Updating next step
RobStand
committed
Fixing illegal bookmark usage
RobStand
committed
Fixing build warning in dotnet reference
RobStand
committed
Fixing build warning in dotnet reference
RobStand
committed
Staging for fix from nuget release
RobStand
committed

Commits on Aug 3, 2017

Fix for bug# 17564. Add gitter.im, specifically the BotBuilder ROOM (#216)

johnd-ms
authored and
Kamran Iqbal
committed
Merge branch 'live' into master
RobStand
authored
Release 08-03-2017 (#217)
RobStand
authored
Sync live with master for release
RobStand
committed

Commits on Aug 4, 2017

17561 deploy from local git (#215)

johnd-ms
authored and
RobStand
committed
add ms.date metadata (#219)

Denise Mak
authored and
RobStand
committed

Commits on Aug 5, 2017

Fixing search scope
RobStand
committed
Release 08-04-2017 (#221)
RobStand
authored
Merge branch 'live' into master
RobStand
committed
# 17767: shorten titles to 80 chars for SEO (#220)

Denise Mak
authored and
RobStand
committed

Commits on Aug 7, 2017

Community content (#223)
RobStand
authored
Configure PDF builds.
Den Delimarsky
authored
Update .openpublishing.publish.config.json
Den Delimarsky
authored
Merge pull request #225 from MicrosoftDocs/master
Den Delimarsky
authored
Merge branch 'live' into live-sync-work
RobStand
authored