11603 Commits

Author SHA1 Message Date
Elizabeth Ross
fa1d1327f4 Merge pull request #801 from Microsoft/jd-sandbox
merge jd-sandbox to master
2017-05-31 08:19:19 -07:00
jdeckerMS
6df2f8fd4a Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2017-05-31 08:02:35 -07:00
jdeckerMS
cfa40795f4 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-05-31 08:01:53 -07:00
jdeckerMS
b045f28920 tweak note per Akshatha 2017-05-31 07:48:21 -07:00
jdeckerMS
239f41aedf Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-05-31 07:45:18 -07:00
Elizabeth Ross
c169818633 Merge pull request #800 from Justinha/vsts11339947
fixed table formatting
2017-05-30 20:45:13 -07:00
Justin Hall
d5214402b6 fixed tables 2017-05-30 16:40:56 -07:00
Justin Hall
1c6012937d fixed table formatting 2017-05-30 16:29:50 -07:00
Elizabeth Ross
5c66370edd Merge pull request #799 from Microsoft/maricia-11881906
Maricia 11881906
2017-05-30 16:03:30 -07:00
Justin Hall
aee40708f3 fixed table formatting 2017-05-30 16:01:42 -07:00
Maricia Alforque
b23bc70c9e TFS 11881906, fixed typo and fixed change history table 2017-05-30 15:39:49 -07:00
Nick Brower
3b4ae91a96 added new file for testing multiple formats 2017-05-30 15:31:47 -07:00
Nick Brower
2ea297d33a removed IoT core column from SKU support table 2017-05-30 15:25:45 -07:00
Maricia Alforque
a1e8502ea9 TFS 11881906, Policy CSP and Configuration service provider topics, support for Windows 10 S 2017-05-30 15:25:19 -07:00
Nick Brower
8921877d4a enforced sku order and represented empty cells; excluded EAS support from horizontal tables 2017-05-30 14:58:51 -07:00
Nick Brower
4419fadcc9 testing horizontal tables for sku support 2017-05-30 14:41:36 -07:00
Joey Caparas
0811b4057a Merge remote-tracking branch 'refs/remotes/origin/master' into atp-tomeralpert 2017-05-30 12:06:35 -07:00
Elizabeth Ross
946cc396e5 Merge pull request #797 from Microsoft/atp-luba
event 15 error
2017-05-30 11:28:13 -07:00
Trudy Hakala
737dca5e81 adding supported markets 2017-05-30 11:21:44 -07:00
Elizabeth Ross
e21b370b6f Merge pull request #796 from Microsoft/nibr-CSPref-reformat
Removed ms.date property from all MDM topics.
2017-05-30 11:12:48 -07:00
Nick Brower
042130f30b removed ms.date property from all mdm topics 2017-05-30 10:22:35 -07:00
Nick Brower
b0253df761 removed ms.date meta data to test default behavior 2017-05-30 09:37:01 -07:00
Trudy Hakala
007bf6fe89 Merge remote-tracking branch 'refs/remotes/origin/master' into msfb-12117503 2017-05-30 09:14:45 -07:00
Trudy Hakala
0157201cdd updating supported markets 2017-05-30 09:07:53 -07:00
Trudy Hakala
cf83d16ecf Merge remote-tracking branch 'refs/remotes/origin/master' into msfb-12117503 2017-05-30 08:41:14 -07:00
Elizabeth Ross
7fb7ff58aa Merge pull request #202 from yusufozturk/patch-1
Typo fix for ICMP DoS Attack
2017-05-30 08:28:53 -07:00
Elizabeth Ross
9c884932a8 Merge pull request #203 from yusufozturk/patch-2
Typo fix for ICMP DoS Attack
2017-05-30 08:28:34 -07:00
Elizabeth Ross
5afb21da35 Merge pull request #204 from yusufozturk/patch-3
Typo fix for ICMP DoS Attack
2017-05-30 08:28:15 -07:00
Yusuf Ozturk
c8182dad77 Typo fix for ICMP DoS Attack
Additional ICMP typo fix
2017-05-29 11:47:07 +02:00
Yusuf Ozturk
73bba26fd1 Typo fix for ICMP DoS Attack
Additional ICMP typo fix
2017-05-29 11:46:03 +02:00
Yusuf Ozturk
227049635a Typo fix for ICMP DoS Attack
It is ICMP (Internet Control Message Protocol) DoS Attack.
2017-05-29 11:40:46 +02:00
Elizabeth Ross
43834c2ad7 Merge pull request #795 from Microsoft/nibr-CSPref-reformat
Nibr meta data replacement round 2
2017-05-26 15:04:36 -07:00
Nick Brower
9c45d6ac8d removed extra newline character added in meta data replacement 2017-05-26 14:13:44 -07:00
Nick Brower
232846e290 attempt 2 at meta data replacement 2017-05-26 14:02:24 -07:00
Joey Caparas
d3920ae05f fix hyperlink 2017-05-26 13:59:54 -07:00
Joey Caparas
4698873507 update image 2017-05-26 13:44:56 -07:00
Joey Caparas
b374357880 images 2017-05-26 13:37:13 -07:00
Trudy Hakala
ab3c02abec Merge remote-tracking branch 'refs/remotes/origin/master' into msfb-12117503 2017-05-26 13:32:19 -07:00
Trudy Hakala
83ddaaa4f3 Merge remote-tracking branch 'refs/remotes/origin/master' into msfb-12117408 2017-05-26 13:30:51 -07:00
Joey Caparas
2f6df02098 Merge remote-tracking branch 'origin/atp-siem' into atp-siem
# Conflicts:

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping3.png

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping4.png
2017-05-26 13:30:30 -07:00
Joey Caparas
b472ee0beb update image label sizes 2017-05-26 13:30:06 -07:00
Joey Caparas
a46967700e add image 2017-05-26 13:22:52 -07:00
jcaparas
1575465fea fix number size 2017-05-26 13:21:21 -07:00
Joey Caparas
043bf25678 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-26 13:08:30 -07:00
Joey Caparas
62f5569966 fix table 2017-05-26 13:07:52 -07:00
Elizabeth Ross
3a6e0771f5 Merge pull request #794 from Microsoft/nibr-CSPref-reformat
Nibr metadata commit reverts
2017-05-26 12:58:36 -07:00
jcaparas
180fe56e77 Update api-portal-mapping-windows-defender-advanced-threat-protection.md 2017-05-26 12:52:05 -07:00
Nick Brower
a379dd8f30 Merge branch 'master' into nibr-CSPref-reformat 2017-05-26 12:33:20 -07:00
Nick Brower
18096c7b89 Revert "updated metadata to get data metrics from new repo"
This reverts commit 60360eb6c5cf0dda13179cc134da0fde40ca447b.
2017-05-26 12:32:16 -07:00
Nick Brower
6c4a468436 Revert "fixed missing 'author' metadata"
This reverts commit 7c9b4c17cab01253bff8afcf5ab4a4615dcd1f72.
2017-05-26 12:30:48 -07:00