Skip to content

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

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.

Sign up for GitHub

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

Merged
RobStand merged 63 commits into from
Aug 7, 2017
Merged

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

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
49fb298
Release 07-07-2017 (#176)
RobStand Jul 7, 2017
0973c43
Sync with live for 7-7-17 release
RobStand Jul 7, 2017
12646e6
ISO 639-2 recommends use of the language codes in lower case (#175)
johnd-ms Jul 8, 2017
926f3c4
Update bot-builder-dotnet-quickstart.md
brandonh-msft Jul 6, 2017
d0cd730
Removing bad metadata (#183)
Jul 14, 2017
ac1c2eb
Release 07-14-2017 (#184)
Jul 14, 2017
010b980
Conversation designer (#178)
v-ducvo Jul 14, 2017
1e3591f
Conversation Designer going live (#188)
Jul 14, 2017
574e013
requires (#186)
johnd-ms Jul 14, 2017
1ce3e76
Merge branch 'master' into live
RobStand Jul 14, 2017
6f6c2c2
Dialog next steps (#177)
v-ducvo Jul 20, 2017
9743606
Release 7-20-2017
RobStand Jul 20, 2017
3361cd6
Sync for release
RobStand Jul 20, 2017
8d30028
Subscribe to bot events, always show bot online (#189)
johnd-ms Jul 20, 2017
ec98458
Changing author alias (#193)
RobStand Jul 20, 2017
b4ec305
links to best current samples, User Story 17067 (#185)
johnd-ms Jul 20, 2017
6c0f28c
Second effort for PR181 (#187)
johnd-ms Jul 20, 2017
9370c54
Groupme screencaps (#191)
johnd-ms Jul 20, 2017
6de5e70
Updates to Slack, GroupMe, sample links, next steps (#194)
Jul 20, 2017
2c3143e
Fixed broken anchor links from table to section in topic. (#195)
v-ducvo Jul 21, 2017
36215da
Adding NoIndex, NoFollow to metadata (#196)
RobStand Jul 24, 2017
2ba2d36
Merge branch 'live' into master
RobStand Jul 24, 2017
5d966b7
Release 7-24-2017 (#197)
RobStand Jul 24, 2017
df7db59
Merge branch 'live'
RobStand Jul 24, 2017
27620f9
Removing broken video
RobStand Jul 26, 2017
88128b2
Update bot-builder-nodejs-cortana-skill.md
Jul 28, 2017
b7400f1
Update bot-builder-nodejs-cortana-skill.md (#198)
Jul 28, 2017
79f5dd8
added dotnet scorable dialogs (#180)
matthewshim-ms Jul 28, 2017
07aafb8
Merge branch 'live' into master
Jul 28, 2017
bf01cb8
Update filenames.md
RobStand Jul 28, 2017
9f42eca
Added entries about the documentation (#206)
RobStand Jul 31, 2017
23fa10d
Slack review (#204)
johnd-ms Aug 1, 2017
229e7ef
Scorable review (#203)
Aug 1, 2017
34ad2cf
Grammar correction. Whose, not Who's (#33)
Jul 24, 2017
3a6f112
Updated to correct version of IISExpress (#35)
deankroker Jul 31, 2017
ab17c93
Update resources-tools-downloads.md (#31)
mschray Aug 1, 2017
2fc82cc
Changed AttachmentLayouts to AttachmentLayoutTypes (#38)
peterkaplan Aug 1, 2017
be39fd3
Release 08-01-2017 (#207)
RobStand Aug 1, 2017
b979a3b
Updating next step
RobStand Aug 1, 2017
0b6fc95
Fixing illegal bookmark usage
RobStand Aug 1, 2017
53a0d6f
Fixing build warning in dotnet reference
RobStand Aug 1, 2017
c1fc1a8
Fixing build warning in dotnet reference
RobStand Aug 1, 2017
346bb26
Staging for fix from nuget release
RobStand Aug 1, 2017
a87b3e1
Cropped out wechat icon. wechat is not supported (#209)
RobStand Aug 2, 2017
f65fd93
Merge branch 'master' into live
RobStand Aug 2, 2017
8334a16
three downloads for one template (#212)
johnd-ms Aug 2, 2017
886333d
Initialize open publishing repository: https://github.com/MicrosoftDo…
RobStand Aug 2, 2017
e65b0ca
Initialize open publishing repository: https://github.com/MicrosoftDo…
RobStand Aug 2, 2017
46db002
Fix for bug# 17564. Add gitter.im, specifically the BotBuilder ROOM (…
johnd-ms Aug 3, 2017
22b7e60
Merge branch 'live' into master
RobStand Aug 3, 2017
998faaa
Release 08-03-2017 (#217)
RobStand Aug 3, 2017
b9e944b
Sync live with master for release
RobStand Aug 3, 2017
0748ceb
17561 deploy from local git (#215)
johnd-ms Aug 4, 2017
b2005b8
add ms.date metadata (#219)
Aug 4, 2017
44e9b64
Fixing search scope
RobStand Aug 5, 2017
20d2a36
Release 08-04-2017 (#221)
RobStand Aug 5, 2017
1a9969c
Merge branch 'live' into master
RobStand Aug 5, 2017
83cbd9c
# 17767: shorten titles to 80 chars for SEO (#220)
Aug 5, 2017
722d5a5
Community content (#223)
RobStand Aug 7, 2017
159b9b1
Configure PDF builds.
Aug 7, 2017
e74c9e5
Update .openpublishing.publish.config.json
Aug 7, 2017
a3b598a
Merge pull request #225 from MicrosoftDocs/master
Aug 7, 2017
91332fb
Merge branch 'live' into live-sync-work
RobStand Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update .openpublishing.publish.config.json
  • Loading branch information
Den Delimarsky authored Aug 7, 2017
commit e74c9e5c8e8250467013218b7797caa8eb778ca7
4 changes: 4 additions & 0 deletions .openpublishing.publish.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
"live": [
"Publish",
"Pdf"
],
"master": [
"Publish",
"Pdf"
]
},
"need_generate_pdf_url_template": false,
Expand Down