Commit graph

3134 commits

Author SHA1 Message Date
bd313cb38d
Merge pull request #114 from Delta-Sierra/master
add Sowbug group
2017-11-08 17:42:06 +01:00
Deborah Servili
3369270bdb add Sowbug group 2017-11-08 15:05:37 +01:00
b44ad17af6
Merge pull request #113 from Delta-Sierra/master
add sector vocabulary
2017-11-08 14:59:43 +01:00
Deborah Servili
5ff524b48f add sector vocabulary 2017-11-08 12:15:47 +01:00
Deborah Servili
e765dce27d
Merge pull request #112 from Delta-Sierra/master
update Felismus RAT
2017-11-08 12:05:51 +01:00
Deborah Servili
5ee2001391 update Falismus RAT 2017-11-08 11:34:55 +01:00
febf3ab9f3
Merge pull request #111 from Delta-Sierra/master
Fix README.md AGAIN
2017-11-07 16:34:23 +01:00
Deborah Servili
eda3b0a2de Merge https://github.com/MISP/misp-galaxy 2017-11-07 15:16:20 +01:00
Deborah Servili
653a7d70d0 ##comma## AGAIN 2017-11-07 15:14:38 +01:00
419f7918e9
Merge pull request #110 from Delta-Sierra/master
Fix README.md
2017-11-07 15:11:13 +01:00
Deborah Servili
1b5378ba68 Merge https://github.com/MISP/misp-galaxy 2017-11-07 15:10:12 +01:00
edae00f4ca
Merge pull request #108 from sbrom/master
Updated with data from APT Groups and Operations
2017-11-07 15:08:25 +01:00
Deborah Servili
fa0965d9d2 ##comma## 2017-11-07 15:06:03 +01:00
a83deb5949
Merge pull request #109 from Delta-Sierra/master
update README
2017-11-07 15:00:56 +01:00
Deborah Servili
00778ee68c update README 2017-11-07 14:38:55 +01:00
sbrom
e5692102c1
Merge pull request #4 from frbor/fix-iso-code-3
Fix iso codes
2017-11-07 14:19:35 +01:00
Fredrik Borg
72d8bfc28a fix-iso-code-3 2017-11-07 14:15:40 +01:00
Fredrik Borg
afc4972e25 fix iso codes 2017-11-07 14:04:04 +01:00
sbrom
3d295eba3b
Merge pull request #2 from frbor/master
Remove duplicate references
2017-11-07 13:37:23 +01:00
Fredrik Borg
b83ca4e186 Merge branch 'fix-duplicates' 2017-11-07 13:35:01 +01:00
Fredrik Borg
53a6a8d26f remove duplicate references 2017-11-07 13:34:44 +01:00
sbrom
c0575bf102
Merge pull request #1 from frbor/master
Replace tab with space and add newline at end of file
2017-11-07 13:26:36 +01:00
Fredrik Borg
7f3ab79962 Replace tab with space and add newline at end of file 2017-11-07 13:19:50 +01:00
Siri Bromander
bf0d1d27ca Updated with data from APT Groups and Operations 2017-11-07 11:07:23 +01:00
1dda4ef9cd
Merge branch 'master' of github.com:MISP/misp-galaxy 2017-11-04 12:52:06 +01:00
b4c083d325
fix: dedication page (CEF) and update overall structure of the document generated 2017-11-04 12:51:20 +01:00
Raphaël Vinot
0cff14a291
Merge pull request #107 from frbor/iso-codes
Use standard (2 digits) ISO codes for all countries
2017-11-01 10:17:15 -07:00
Fredrik Borg
26192bf39a Bump version number 2017-11-01 18:14:20 +01:00
Fredrik Borg
51f86d5382 Use standard (2 digits) ISO codes for all countries 2017-11-01 12:38:21 +01:00
Raphaël Vinot
aa93b0e61d Update banker galaxy 2017-10-27 11:10:26 -04:00
Raphaël Vinot
756af14983 Merge branch 'master' of github.com:MISP/misp-galaxy 2017-10-27 10:50:58 -04:00
Raphaël Vinot
eef988e9ad Cosmetic updates 2017-10-27 10:50:47 -04:00
Deborah Servili
253e4d2f41 Merge pull request #106 from Delta-Sierra/master
add htpRAT
2017-10-27 16:24:28 +02:00
Deborah Servili
7246746bbe add htpRAT 2017-10-27 15:50:22 +02:00
569c07f7e9 Merge pull request #105 from Delta-Sierra/master
add dimnie
2017-10-27 11:49:05 +02:00
Deborah Servili
2fefd3810d add dimnie 2017-10-27 11:42:01 +02:00
5a738fd44c Merge pull request #104 from Delta-Sierra/master
add ttp-categories descriptions
2017-10-27 10:52:31 +02:00
Deborah Servili
673157fc92 add ttp-categories descripiions 2017-10-27 10:46:49 +02:00
Deborah Servili
ad9fff6c3f Merge pull request #103 from Delta-Sierra/master
add Formbook
2017-10-27 10:40:00 +02:00
Deborah Servili
2533c1b54e fix typo 2017-10-27 10:33:58 +02:00
Deborah Servili
5597e5af1c add Formbook 2017-10-27 10:30:21 +02:00
Raphaël Vinot
24e7d89ac9 Deduplicate Android cluster 2017-10-26 19:00:57 -04:00
Raphaël Vinot
40e26a59f1 Merge branch 'master' of github.com:MISP/misp-galaxy 2017-10-26 18:54:56 -04:00
Raphaël Vinot
6d0952e4ed Add android and banker galaxies 2017-10-26 18:53:01 -04:00
aed963c52d Merge pull request #102 from Delta-Sierra/master
delete x_ prefix from mitre_attack_pattern
2017-10-26 10:36:02 +02:00
Deborah Servili
709b78c2de jq 2017-10-26 10:28:53 +02:00
Deborah Servili
3a41799542 add galaxy icon to mitre-cti tools & regenerate galaxies 2017-10-26 10:28:05 +02:00
Deborah Servili
fa8c4ec839 delete x_ prefix from mitre_attack_pattern 2017-10-26 09:44:23 +02:00
Raphaël Vinot
72dbbb28fa Remove the executable flag from the json files, again 2017-10-25 12:29:16 -04:00
Raphaël Vinot
c6f9c5261c Merge branch 'master' of github.com:MISP/misp-galaxy 2017-10-25 12:28:01 -04:00