39 Commits

Author	SHA1	Message	Date
Brian Lich	0667e1e1fe	Revert "reverting changes" ... This reverts commit ecd000f39a712dab62dcc117494c8be802a18637.	2017-01-25 14:45:35 -08:00
Brian Lich	ecd000f39a	reverting changes	2017-01-25 14:27:06 -08:00
Celeste de Guzman	624088b11a	resolving conflict	2016-12-06 17:24:59 -08:00
Celeste de Guzman	9fc0583ed5	updated the TOC to include pro to pro edu upgrade	2016-11-07 12:46:58 -08:00
Trudy Hakala	1447e12772	adding new topic to TOC	2016-10-28 09:17:01 -07:00
Celeste de Guzman	802e8486e4	Update TOC.md	2016-09-19 12:07:04 -07:00
Celeste de Guzman	3f02c09a93	updated 3 files for Sept 12 update	2016-09-11 21:24:24 -07:00
Celeste de Guzman	4c0e13418e	updated the toc	2016-09-09 12:53:35 -07:00
Celeste de Guzman	0a1f5427c6	updated the TOC to include new topic	2016-09-09 12:41:25 -07:00
jdeckerMS	66c0c1044b	resolve merge conflicts ... # Conflicts: # education/windows/TOC.md # education/windows/index.md	2016-07-27 12:43:27 -07:00
Jan Backstrom	7f01a8877d	Merge remote-tracking branch 'refs/remotes/origin/janb-winedu-deployschooldistrict' ... # Conflicts: # education/windows/change-history-edu.md	2016-07-27 12:06:51 -07:00
jdeckerMS	618531377e	Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 ... # Conflicts: # education/windows/TOC.md # education/windows/change-history-edu.md # education/windows/index.md # windows/manage/TOC.md	2016-07-27 09:40:35 -07:00
jdeckerMS	cb4091c607	new version	2016-07-27 07:52:35 -07:00
Celeste de Guzman	508d57f983	updated TOC to include deployment recommendations for school IT admins topic	2016-07-25 13:43:32 -07:00
Jan Backstrom	b201a26b59	Add to TOC, Index, Change History	2016-07-22 18:03:23 -07:00
jdeckerMS	f700490ed6	fix typo	2016-07-19 06:58:02 -07:00
jdeckerMS	f0231f34b3	remove "preview" tag from topics	2016-07-12 09:22:56 -07:00
jdeckerMS	99c7d49321	add minecraft	2016-06-10 12:45:08 -07:00
jdeckerMS	8e297d9af2	toc tweak	2016-06-08 12:32:07 -07:00
jdeckerMS	c1752cca91	sync to stage	2016-06-08 09:21:30 -07:00
Trudy Hakala	2c7d14bc60	TOC updated and adding content	2016-06-02 15:30:30 -07:00
Trudy Hakala	319a41a845	adding art, adding files to TOC, and updates for teacher topic	2016-06-02 13:18:37 -07:00
jdeckerMS	41eb775b23	tweak h1s	2016-05-26 09:16:31 -07:00
jdeckerMS	14c33eb654	add steps to apply task	2016-05-26 08:22:28 -07:00
jdeckerMS	7963ced4f2	minor text corrections	2016-05-26 07:33:45 -07:00
jdeckerMS	a0f6d4e8b7	prep for initial publication	2016-05-25 09:06:59 -07:00
jdeckerMS	8f0b93bcff	add change history	2016-05-25 08:50:30 -07:00
jdeckerMS	e008b37114	will another commit get tnstage working again?	2016-05-19 12:16:16 -07:00
jdeckerMS	f9a7ca405a	troubleshooting	2016-05-19 09:27:09 -07:00
jdeckerMS	e217169341	adding minecraft	2016-05-19 08:51:16 -07:00
jdeckerMS	ded583a15c	restrctured take-a-test	2016-05-17 08:25:42 -07:00
jdeckerMS	4dc10a879f	new topic staged	2016-05-17 07:03:50 -07:00
jdeckerMS	d79f30b6b2	added new topic to toc/index	2016-05-13 10:23:42 -07:00
jdeckerMS	dc4fdde96c	new art, new content	2016-05-13 10:20:21 -07:00
jdeckerMS	71aebac2d8	add video, new topic	2016-05-12 12:26:33 -07:00
jdeckerMS	1242eb8e17	add topic, delete video test	2016-05-12 08:22:36 -07:00
jdeckerMS	876cc3f8b2	video test	2016-05-12 08:01:24 -07:00
jdeckerMS	43083f00e7	copied 2 edu topics from win10	2016-05-12 07:37:13 -07:00
jdeckerMS	b0ab633a64	added folder duh	2016-05-11 13:54:32 -07:00