316 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Herman Slatman	017bc56bd1	Merge pull request #45 from hslatman/hs_redline ... Redline added	2016-05-25 10:19:07 +02:00
Herman Slatman	44b017aaea	Merge branch 'master' into hs_redline	2016-05-24 21:03:53 +02:00
Herman Slatman	a3a00cd3e0	Add SSL BL to whitelist	2016-05-24 21:03:23 +02:00
Herman Slatman	908ef28298	Redline added	2016-05-24 20:38:53 +02:00
Herman Slatman	2c845f8f99	Merge pull request #44 from hslatman/hs_loki ... Loki added	2016-05-22 15:05:00 +02:00
Herman Slatman	7bd941412c	Another problematic link fixed	2016-05-22 14:27:16 +02:00
Herman Slatman	237d9e2136	Whitelist problematic links	2016-05-22 12:14:44 +02:00
Herman Slatman	3bec3b8690	Update ThreatTracker repo	2016-05-22 12:14:02 +02:00
Herman Slatman	bcedef2ea1	Loki added	2016-05-21 15:24:53 +02:00
Herman Slatman	513d929e66	Merge pull request #43 from hslatman/hs_tih ... Threat-Intelligence-Hunter added	2016-05-01 00:19:33 +02:00
Herman Slatman	4cf18ad613	Whitelist diamond model	2016-04-30 12:31:30 +02:00
Herman Slatman	b81f9480d0	Fix Mantis link	2016-04-30 12:28:59 +02:00
Herman Slatman	2b5f847dfb	Fix DBIR link	2016-04-30 12:28:49 +02:00
Herman Slatman	7d9d17aa8a	Threat-Intelligence-Hunter added	2016-04-30 12:25:32 +02:00
Herman Slatman	0f81f2a046	Merge pull request #42 from hslatman/hs_blueliv_exchange ... Blueliv community threat exchange added	2016-04-26 11:47:15 +02:00
Herman Slatman	76caa615dd	Blueliv community threat exchange added	2016-04-26 11:45:34 +02:00
Herman Slatman	46f2557679	Merge pull request #41 from hslatman/hs_nist_draft2 ... Updated to 2nd draft	2016-04-24 00:47:17 +02:00
Herman Slatman	0bd9c458d1	ignore fireeye link	2016-04-24 00:45:36 +02:00
Herman Slatman	7bb0d52364	Updated to 2nd draft	2016-04-24 00:41:04 +02:00
Herman Slatman	11915ff771	Merge pull request #40 from hslatman/hs_rastrea2r ... Rastrea2r added	2016-04-19 14:36:29 +02:00
Herman Slatman	152e28b7eb	Rastrea2r added	2016-04-19 14:31:28 +02:00
Herman Slatman	9c9b3ccdfe	Merge pull request #39 from hslatman/hs_abusehelper ... Added AbuseHelper	2016-04-18 10:04:11 +02:00
Herman Slatman	33589643e6	Added AbuseHelper	2016-04-17 00:52:38 +02:00
Herman Slatman	5cf7d8fca3	Merge pull request #38 from hslatman/hs_ipb ... Intelligence Preparation of the Battlefield (IPB) added	2016-04-16 22:29:11 +02:00
Herman Slatman	8b66b02a7a	Intelligence Preparation of the Battlefield (IPB) added	2016-04-16 22:26:22 +02:00
Herman Slatman	9d07ef18d5	Merge pull request #37 from hslatman/hs_big ... Bro-intel-generator added	2016-04-15 11:51:18 +02:00
Herman Slatman	6a0c803eb9	Bro-intel-generator added	2016-04-15 11:49:14 +02:00
Herman Slatman	59335c815e	Merge pull request #36 from hslatman/hs_stoq ... stoQ platform added	2016-04-14 17:21:35 +02:00
Herman Slatman	465beb9962	Change of website for ENISA (IntelMQ)	2016-04-14 17:07:57 +02:00
Herman Slatman	0d1d65a454	stoQ platform added	2016-04-14 17:03:47 +02:00
Herman Slatman	082ff299a0	Merge pull request #35 from hslatman/hs_f3ead ... F3EAD added	2016-04-11 11:52:04 +02:00
Herman Slatman	5f17c0b81f	Merge branch 'hs_jp20' into hs_f3ead	2016-04-11 11:50:18 +02:00
Herman Slatman	2931a3226b	F3EAD added	2016-04-11 11:47:38 +02:00
Herman Slatman	d344b2d687	Merge pull request #34 from hslatman/hs_pyramid ... Pyramid of Pain slides added	2016-04-10 20:02:06 +02:00
Herman Slatman	12870cff29	Pyramid of Pain slides added	2016-04-10 19:59:55 +02:00
Herman Slatman	d0ba6a1108	Merge pull request #33 from hslatman/hs_jp20 ... Added Joint Publication 2-0: Joint Intelligence	2016-04-09 08:50:37 +02:00
Herman Slatman	4601397fcb	Fix https links	2016-04-08 11:21:37 +02:00
Herman Slatman	20a2eb43c9	Fix link for cabby	2016-04-08 11:18:49 +02:00
Herman Slatman	6414a619e8	Fix link for OpenTAXII	2016-04-08 11:18:21 +02:00
Herman Slatman	f5260b56f4	Added Joint Publication 2-0: Joint Intelligence	2016-04-08 11:16:03 +02:00
Herman Slatman	d95a552687	Merge pull request #32 from hslatman/hs_tlp ... Traffic Light Protocol (TLP) added	2016-04-05 15:54:32 +02:00
Herman Slatman	577325864d	Traffic Light Protocol (TLP) added	2016-04-05 15:45:58 +02:00
Herman Slatman	5877c46793	Merge pull request #31 from hslatman/hs_inigma_patch ... Fixing the conflict...	2016-04-04 19:49:14 +02:00
Herman Slatman	411046f6d5	Fix conflict in sources	2016-04-04 19:44:40 +02:00
Herman Slatman	0adaffd135	Merge pull request #30 from hslatman/hs_interflow ... Microsoft Interflow added	2016-04-03 12:51:13 +02:00
Herman Slatman	ec25da70d7	Changed to the deeplink	2016-04-03 12:50:04 +02:00
Herman Slatman	afa54bec56	change link for travis	2016-04-03 12:47:54 +02:00
Herman Slatman	e38a467443	Microsoft Interflow added	2016-04-03 12:45:39 +02:00
Herman Slatman	429b3ba9c8	Merge pull request #29 from hslatman/hs_chain ... Kill Chain paper by Lockheed Martin added	2016-03-28 16:38:34 +02:00
Herman Slatman	1ada060602	Kill Chain paper by Lockheed Martin added	2016-03-28 16:34:27 +02:00