36014 Commits

Author	SHA1	Message	Date
jdeckerMS	bc6cfd88b9	merge conflict	2016-06-14 10:38:02 -07:00
jdeckerMS	1482c6e6f7	Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 ... # Conflicts: # windows/deploy/update-windows-10-images-with-provisioning-packages.md	2016-06-14 10:36:41 -07:00
jdeckerMS	f1ef06a05a	match table to edu	2016-06-14 10:33:58 -07:00
jdeckerMS	c985b3ac1c	tweak table settings	2016-06-14 08:19:18 -07:00
Trudy Hakala	7ba1bcbd93	fixing table missing heading from migration	2016-06-13 19:33:25 -07:00
LizRoss	4b340638f0	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347	2016-06-13 12:09:02 -07:00
Jan Backstrom	e988cd9bb2	update tagging ... add ms.pagetype: mobile	2016-06-13 11:23:49 -07:00
LizRoss	1968c0319c	Updated to add a border to the image	2016-06-13 09:52:39 -07:00
LizRoss	9a84164f71	Updated image to reflect recommended choices	2016-06-13 09:10:10 -07:00
jdeckerMS	c3707d3728	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov ... # Conflicts: # education/windows/TOC.md	2016-06-10 12:44:58 -07:00
jdeckerMS	8623311edd	Merge remote-tracking branch 'refs/remotes/origin/master' into rs1	2016-06-10 12:41:47 -07:00
LizRoss	7869bbcfed	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347	2016-06-10 12:21:53 -07:00
Brian Lich	b93bdff813	tech review feedback	2016-06-10 11:03:32 -07:00
Brian Lich	db46837fcf	Merge branch 'master' into 7518206	2016-06-10 10:46:19 -07:00
Greg Lindsay	769c41474d	Merge branch 'vso-7843900'	2016-06-09 16:39:13 -07:00
Greg Lindsay	f262304cff	added link	2016-06-09 16:38:07 -07:00
LizRoss	3f47bde93f	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347	2016-06-09 10:00:22 -07:00
Brian Lich	5101c5b02c	fixing table and changing nonsecurity upgrades deffered from 8 months to 4 weeks	2016-06-09 09:19:37 -07:00
LizRoss	2d5ca49025	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347	2016-06-09 07:45:25 -07:00
Trudy Hakala	a36702e799	Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326	2016-06-09 07:14:37 -07:00
Greg Lindsay	db66f62389	Merge branch 'vso-7772516'	2016-06-08 16:12:17 -07:00
Greg Lindsay	bce59b1026	comments didn't work just removing lines for now	2016-06-08 16:03:00 -07:00
Greg Lindsay	911e33fc01	commenting out possible problem lines in TOC	2016-06-08 15:54:39 -07:00
Trudy Hakala	224d93b72a	updates for troubleshooting and private store apps	2016-06-08 15:39:33 -07:00
jdeckerMS	87331179a9	add links to deploy prov topics	2016-06-08 13:14:34 -07:00
jdeckerMS	0be3f9a0a1	add apps	2016-06-08 12:30:33 -07:00
LizRoss	e44a3027a4	Updated image name due to rename	2016-06-08 09:48:21 -07:00
LizRoss	f6029a6388	Updating images for new EDP content	2016-06-08 09:35:56 -07:00
jdeckerMS	c1752cca91	sync to stage	2016-06-08 09:21:30 -07:00
jdeckerMS	322ee1b4ee	simple and adv prov	2016-06-07 14:18:54 -07:00
Elizabeth Ross	7e6603fd98	Updated image with new ui	2016-06-07 13:20:59 -07:00
Elizabeth Ross	c3ffd6438e	Fixed broken image	2016-06-07 13:14:29 -07:00
jdeckerMS	b0f93ae78c	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov	2016-06-07 13:02:22 -07:00
jdeckerMS	4b8012d1cd	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-06-07 13:00:53 -07:00
jdeckerMS	50ce8306a6	sync to switch branches	2016-06-07 13:00:18 -07:00
Elizabeth Ross	22de959f5b	New image for new UI, renamed	2016-06-07 12:51:28 -07:00
jdeckerMS	f3b7e39451	Merge remote-tracking branch 'refs/remotes/origin/master' into rs1	2016-06-07 12:40:41 -07:00
jdeckerMS	fb75367c35	fix link	2016-06-07 12:39:04 -07:00
jdeckerMS	831e775239	remove old prov pkg topic	2016-06-07 12:30:32 -07:00
jdeckerMS	36772ec88f	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov	2016-06-07 12:28:16 -07:00
jdeckerMS	cd08ffe21c	windows key 5 times	2016-06-07 12:23:09 -07:00
Elizabeth Ross	af5c33d5ae	Adding new images	2016-06-07 11:43:05 -07:00
jdeckerMS	e8cc84055d	fixed edu language	2016-06-07 10:45:41 -07:00
jdeckerMS	dcf3ad84c2	ready for tech review	2016-06-07 10:35:15 -07:00
jdeckerMS	6212747750	new art	2016-06-07 10:30:25 -07:00
jdeckerMS	82ad395cda	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs	2016-06-07 09:55:56 -07:00
Elizabeth Ross	9464193f47	Added new file for AppLocker Policy Files	2016-06-07 09:54:59 -07:00
jdeckerMS	3ec6ea2965	policy name changes	2016-06-07 09:54:46 -07:00
jdeckerMS	7154cd8612	Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdngcrs	2016-06-07 09:30:22 -07:00
jdeckerMS	460b347dd4	sync to change branches	2016-06-07 09:29:40 -07:00