Commit Graph

777 Commits (12e214014a4870b21ec1e6f032f48c17a8a9c61f)

Author SHA1 Message Date
Alexandre Dulaunoy 12e214014a
chg: [doc] copyright statement updated 2019-11-05 16:44:07 +01:00
Alexandre Dulaunoy 4cef05f418
chg: [doc] summary added 2019-11-05 15:31:20 +01:00
Alexandre Dulaunoy 7dc7fada3c
chg: [doc] Summary file removed 2019-11-05 15:30:05 +01:00
Alexandre Dulaunoy 854f33e770
chg: [MANIFEST] newline is the king of the castle 2019-11-05 15:26:20 +01:00
Alexandre Dulaunoy bccc0988e2
fix: [tool] newline 2019-11-05 15:20:30 +01:00
mokaddem a7bba2caeb fix: [tool] Write in utf8 2019-11-05 15:13:41 +01:00
mokaddem 07fa7a0553 Merge branch 'feature-exclusive' 2019-11-05 15:06:16 +01:00
mokaddem 05778f0157 chg: [tool] sort before output 2019-11-05 15:03:16 +01:00
Alexandre Dulaunoy a89594422e
chg: [tools] utf-8 by default 2019-11-05 14:47:54 +01:00
Alexandre Dulaunoy cf20bb8e0d
chg: [MANIFEST] update 2019-11-05 14:44:18 +01:00
Alexandre Dulaunoy 519d1f45b5
Merge pull request #174 from MISP/feature-exclusive
Feature `exclusive` and `numerical_value`
2019-11-05 14:41:46 +01:00
mokaddem 4e21962961 new: Added Manifest and Markdown generators 2019-11-05 12:00:28 +01:00
mokaddem 4999bb6172 chg: [economical-impact] No need to bump version twice 2019-11-05 10:34:48 +01:00
mokaddem 6bc0974158 chg: [numerical_value] Incremented version of taxonomies having num_val 2019-11-05 10:31:53 +01:00
mokaddem 4004997d0f chg: [exclusive] Set `exclusive` meta for relevant taxonomies 2019-11-05 10:28:02 +01:00
Alexandre Dulaunoy 47db7a9306
Merge pull request #173 from wesinator/patch-1
Correct Diamond model taxonomy description
2019-11-05 06:44:06 +01:00
Ԝеѕ 054b68ce9b
Correct Diamond model taxonomy description
#172
2019-11-04 23:40:19 -05:00
Alexandre Dulaunoy a3be45aa66
Merge pull request #167 from Delta-Sierra/master
[WiP] - starting IoT taxonomy based on https://iotuk.org.uk/wp-content/upload
2019-10-30 13:30:45 +01:00
Deborah Servili b9e08931a5
jq 2019-10-30 13:26:06 +01:00
Deborah Servili dab1449212
Update MANIFEST.json 2019-10-30 13:19:18 +01:00
Deborah Servili b152d38d33 Merge https://github.com/MISP/misp-taxonomies 2019-10-30 13:17:54 +01:00
Alexandre Dulaunoy 68332e01de
Merge pull request #171 from Terrtia/master
chg: [infoleak] add public-key
2019-10-29 15:49:01 +01:00
Terrtia 2aa7b29046
chg: [infoleak] add public-key 2019-10-28 14:49:37 +01:00
Deborah Servili cf0ddd714a
Merge pull request #170 from Nedfire2347/master
Risk Add
2019-10-24 14:39:11 +02:00
root 45e8d5611a <Risk governance> 2019-10-24 14:36:31 +02:00
root 0ad8d73b9c <Risk Management> 2019-10-24 14:30:10 +02:00
root b70ade20b1 <Risk Governance> 2019-10-24 14:27:47 +02:00
Deborah Servili 21b2109631
Merge pull request #169 from Nedfire2347/master
gea-nz
2019-10-24 14:14:44 +02:00
root 2e3d3c466f <comit> 2019-10-24 14:10:45 +02:00
root 9822129657 <GEA-Manifest> 2019-10-24 14:05:35 +02:00
root 885216714a <commit GEA> 2019-10-24 14:00:07 +02:00
root d80ddf2e41 <GEA-Test> 2019-10-24 13:55:11 +02:00
Nedfire23 a2ba83430d
Merge branch 'master' into master 2019-10-24 13:30:59 +02:00
root 125c362ae1 <GEA-Directory> 2019-10-24 13:12:28 +02:00
root f0410bd97f <GEA-Directory> 2019-10-24 13:10:36 +02:00
root b5e5352c37 <test Activities> 2019-10-24 12:59:45 +02:00
root 678af3cfcf <GEA-Activities> 2019-10-24 12:58:45 +02:00
root 515a03ee79 <GEA-Activities> 2019-10-24 12:50:52 +02:00
root 92626adae7 <Gea-NZ 3folders> 2019-10-24 12:00:54 +02:00
root 2449852a2b <Modification GEA-NZ> 2019-10-24 11:29:41 +02:00
root 5ddaddc8d3 <Pretesting> 2019-10-24 00:54:56 +02:00
Alexandre Dulaunoy 47a4080c14
chg: [coa] typo fixed for deceive 2019-10-23 11:43:35 +02:00
Alexandre Dulaunoy 7e3cc7da5d
Merge branch 'yannw-master' 2019-10-23 11:19:31 +02:00
Alexandre Dulaunoy 81179ad7c3
chg: [MANIFEST] jq all the things 2019-10-23 11:18:57 +02:00
Alexandre Dulaunoy 4f673c758c
Merge branch 'master' of https://github.com/yannw/misp-taxonomies into yannw-master 2019-10-23 11:18:24 +02:00
yannw 6714b04f01
Update MANIFEST.json 2019-10-22 03:13:08 +02:00
yannw 44ba78a0ad
coa taxonomie to describe aktion taken 2019-10-22 02:46:06 +02:00
Alexandre Dulaunoy 9a205bbf41
chg: [MANIFEST] updated to the latest version 2019-10-18 14:38:33 +02:00
Alexandre Dulaunoy df75c655c4
chg: [expiration] 10 years expiration 2019-10-18 14:37:02 +02:00
Deborah Servili baf982b7f5
progress on IoT taxonomy - add description 2019-10-17 12:32:09 +02:00