Commit Graph

1531 Commits

Author SHA1 Message Date
35507b2ecc revert back images with endpoint mgt, resolve conflicts 2016-07-29 16:20:01 +10:00
1ef74488de from rs1 2016-07-29 15:54:21 +10:00
d18148961f Merge remote-tracking branch 'refs/remotes/origin/rs1' into Aug2
# Conflicts:
#	windows/keep-secure/TOC.md

#	windows/keep-secure/implement-microsoft-passport-in-your-organization.md
#	windows/keep-secure/index.md
#	windows/keep-secure/prepare-people-to-use-microsoft-passport.md
#	windows/keep-secure/windows-hello-in-enterprise.md
2016-07-29 15:50:07 +10:00
9891b674be from master 2016-07-29 15:25:57 +10:00
eab21fc40c commit 2016-07-29 15:19:46 +10:00
ec2142f336 fixing merge conflicts 2016-07-28 14:54:31 -07:00
052d609933 Updated incorrect image 2016-07-28 14:06:30 -07:00
f9f1a26c07 Fixed references from EDP to WIP 2016-07-28 13:59:33 -07:00
1068f8cb4d Updated to include WIP changes 2016-07-28 13:50:09 -07:00
43f3f63fea secure loc tags 2016-07-28 12:46:41 -07:00
ba0d779720 SCCM 2016 2016-07-28 12:25:26 -07:00
2d2b419b14 app clarification 2016-07-28 09:25:46 -07:00
2420bbc450 phone signin tap note 2016-07-28 09:00:52 -07:00
013241011b Removed the 2016 from System Center Configuration Manager 2016-07-28 08:03:59 -07:00
cbaf7404b7 Changed EDP to WIP in new note 2016-07-28 07:28:23 -07:00
639d636a0b Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-28 07:11:18 -07:00
f5df452455 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-28 06:51:02 -07:00
faad0a2461 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-28 06:50:06 -07:00
db59186e91 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-28 06:43:51 -07:00
fcb6fe8a8b updates based on naama's feedback 2016-07-28 20:13:36 +10:00
ed9e92eef5 updates based on Naama's feedback 2016-07-28 19:45:31 +10:00
c76113fd9e updates based on sync with Naama 2016-07-28 18:25:04 +10:00
7525874d25 PUA topic for RS1 2016-07-28 17:27:59 +10:00
ea5a652fc5 Updated with bug fix 7699825 2016-07-28 17:09:53 +10:00
0aca69d131 Updated with bug fix 2016-07-28 17:04:15 +10:00
b44fce313c updated TOC, update note and links 2016-07-27 23:55:30 -07:00
320525d03d Add enhanced notifs. Do near-final copyedit. 2016-07-27 23:36:34 -07:00
82c109414f update sccm, update script 2016-07-28 15:05:26 +10:00
341fb8cc09 add connectivity tool instructions 2016-07-28 14:36:13 +10:00
dafcae5569 update based on Ronen's feedback 2016-07-28 12:00:26 +10:00
89900e907d Merge remote-tracking branch 'refs/remotes/origin/rs1' into Aug2 2016-07-28 11:16:01 +10:00
6e21c93633 add vpn stuff 2016-07-27 13:58:21 -07:00
2f0549e8d0 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-27 12:56:35 -07:00
fb1c95e35e reverted back to previous state 2016-07-28 05:56:09 +10:00
66c0c1044b resolve merge conflicts
# Conflicts:
#	education/windows/TOC.md
#	education/windows/index.md
2016-07-27 12:43:27 -07:00
4654dbc411 need to switch branches 2016-07-27 12:41:47 -07:00
26dd2bc2fc Added bug fix 7699825 2016-07-28 05:34:38 +10:00
12d7c1ba7b Updated important note with newer version number 2016-07-27 12:18:09 -07:00
11adfbec34 Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1 2016-07-27 09:57:46 -07:00
f27140df84 Fixed broken link 2016-07-27 09:46:33 -07:00
c42b3f0809 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-27 09:44:13 -07:00
44f94289d7 Updated the important note so it doesn't have to be changed with each version 2016-07-27 09:32:10 -07:00
5a92db6171 update table to fix numbering 2016-07-27 19:34:12 +10:00
96b2f8f213 fix formatting 2016-07-27 18:50:41 +10:00
e4f64e0ed7 update In this section to add new topics 2016-07-27 15:45:05 +10:00
833d39fe9d Add files via upload 2016-07-26 21:46:08 -07:00
43fb2b77f0 Update windows-defender-offline.md 2016-07-26 21:41:41 -07:00
a01f232c83 update to reflect Uri feedback 2016-07-27 14:38:50 +10:00
f84c976fef Delete blank.md 2016-07-26 21:35:07 -07:00
61a40064ff Add files via upload 2016-07-26 21:34:12 -07:00