MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
8,758 Commits
41 Branches
370 Tags
180 MiB
Commit Graph

8758 Commits (8f0af5416803bca835abbc0319e5e7d400a2e379)

Author SHA1 Message Date
Steve Clement 8f0af54168 chg: [kali] fix redis install 2018-07-11 22:53:07 +02:00
Steve Clement 5f1a0bcaab
fix: [kali] Fix RAW URL 2018-07-11 22:24:34 +02:00
Steve Clement 2900ca36c3
Merge pull request #3474 from SteveClement/2.4 
new: [kali] Added initial kali linux script that can install a MISP instance with "one click"
 2018-07-11 22:23:14 +02:00
Steve Clement 3ca78d54c9 chg: [kali] misp-modules start on install 2018-07-11 22:18:10 +02:00
Steve Clement 8430afff4f chg: [kali] added SSL, removed manual redis install 2018-07-11 22:04:12 +02:00
Steve Clement 23fedfbb82 chg: [kali] skip dist-upgrade for time reasons 2018-07-11 21:40:18 +02:00
Steve Clement 5213b9b2e5 chg: [kali] Fixed perms at the end 2018-07-11 21:37:20 +02:00
Steve Clement 36a8c1849b Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-11 20:39:47 +02:00
Steve Clement 88fd94514a chg: [doc] Adapted auto messages 2018-07-11 19:10:41 +02:00
Steve Clement 7935a1a063 chg: [doc] Updates to Debian guides, mostly cake automation 
new: [doc] Install doc/script for kali linux deployment
 2018-07-11 19:04:29 +02:00
iglocska 3fb8269fce Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-11 15:02:47 +02:00
iglocska 90a8e9110b fix: [freetext] parser was detecting any number as a phone number, fixes #3469 
- new requirement: must start with + or contain a -
 2018-07-11 15:02:30 +02:00
Steve Clement ef4345ef5b
Merge pull request #3471 from SteveClement/2.4 
chg: [i18n] added and updated various LOCALE files
 2018-07-11 14:46:15 +02:00
Steve Clement 2910b6ca61 chg: [i18n] Latest jpn translation (94%), Latest French (10%) updated default.pot 
new: [i18n] Initial Italian translation (25%), Spanish (1%), Brazilian Portuguese (3%), Korean (1%)
 2018-07-11 14:42:21 +02:00
iglocska 40625a42bd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-11 14:34:02 +02:00
iglocska b43773fb2b fix: [settings] Make travis happy 2018-07-11 14:33:41 +02:00
Steve Clement 11b2c00496 chg: [i18n] updated cake i18n extract --extract-core no --exclude Test,Vendor,Lib 2018-07-11 14:32:28 +02:00
Steve Clement 86c0b3422a
Merge pull request #3470 from SteveClement/2.4 
chg: [doc] Debian guides updated
 2018-07-11 14:17:49 +02:00
Steve Clement ba9ab3eddf Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-11 13:50:41 +02:00
iglocska 8f2377239d fix: [settings] Attempted fix to appease Travis 2018-07-11 10:47:44 +02:00
iglocska 6b31fc6c2e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-11 10:22:12 +02:00
iglocska 089ce29d2f fix: [settings] Default setting for the attachments directory fixed 2018-07-11 10:21:24 +02:00
iglocska 0d45dbc27a new: [API] Check for malformed JSON requests 2018-07-11 10:16:19 +02:00
Alexandre Dulaunoy a885e3ea60
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-11 08:53:17 +02:00
Alexandre Dulaunoy f7089a74d1
chg: [misp-warninglists] updated to the latest version 2018-07-11 08:52:07 +02:00
Steve Clement accf52ba60
Merge pull request #3462 from SteveClement/2.4 
chg: [CLI] update/WarningLists/NoticeLists/ObjectTemplates/Galaxies to Admin CLI
 2018-07-10 14:15:44 +02:00
Steve Clement cd8518482a chg: [CLI] Updated admin commands and added FIXMEs 2018-07-10 13:52:21 +02:00
Steve Clement 2887106141
Merge pull request #2 from iglocska/patch-2 
fix: [CLI] mixup corrected
 2018-07-10 13:34:28 +02:00
Andras Iklody 29cc84f0e2
fix: [CLI] mixup corrected 2018-07-10 13:18:43 +02:00
Steve Clement 16537065d8 Merge branch '2.4' of github.com:SteveClement/MISP into 2.4 2018-07-10 13:02:07 +02:00
Steve Clement 5c829db9fd Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-10 13:01:56 +02:00
Steve Clement 52e13b00b7 chg: [doc] More updates on the debian install guides, small fix on OpenBSD 2018-07-10 11:45:44 +02:00
Alexandre Dulaunoy 221b4dfdc6
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-10 11:11:29 +02:00
Alexandre Dulaunoy 85f32148e5
chg: [misp-objects] updated to the latest version 2018-07-10 11:11:04 +02:00
Steve Clement ececb76124 Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-10 10:37:26 +02:00
Andras Iklody acdf938c58
Merge pull request #3461 from mokaddem/update/attackMatrix 
new: [attackMatrix] possibility to pick multiple galaxies (event-level)
 2018-07-10 09:57:10 +02:00
Alexandre Dulaunoy b79d3a404e
chg: [misp-objects] updated to the latest version 2018-07-10 09:43:41 +02:00
Andras Iklody ad15ffa7ce
Merge pull request #3460 from kalyparker/fix-export-events-csv 
fix: export events csv with CR (fix #3458)
 2018-07-10 09:28:22 +02:00
Sami Mokaddem 1c5b30b1d4 Merge remote-tracking branch 'upstream/2.4' into update/attackMatrix 2018-07-10 07:24:58 +00:00
Sami Mokaddem 2125708b1d new: [attackMatrix] possibility to pick multiple galaxy to attach to the 
event in at the event-level
 2018-07-10 07:23:02 +00:00
Steve Clement 9ef1f461dc Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-10 09:12:07 +02:00
Alexandre Dulaunoy 87d4295119
chg: [misp-objects] updated to the latest version 2018-07-10 09:04:20 +02:00
chrisr3d 639efecc3f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-10 08:57:21 +02:00
Andras Iklody a229bb0c82
Merge pull request #3455 from mokaddem/update/attackMatrix 
Update/attack matrix
 2018-07-09 19:01:44 +02:00
kalyparker 34f15268d2 fix: export events csv with CR (fix #3458) 
Export using automation functionnality for ids does not clean the special char like CRLF.
When there is a carriage return in the event info, the csv is broken.
 2018-07-09 08:58:12 -07:00
chrisr3d 991d2f818f
fix: [sti2 import] Fixed pe-extension parsing 2018-07-09 17:47:07 +02:00
chrisr3d d5db222795
fix: [stix2 import] Including import of custom properties for pe & pe-section objects 2018-07-09 17:33:45 +02:00
chrisr3d 4708641206 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-09 16:29:40 +02:00
iglocska 103da8082d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-09 16:23:12 +02:00
iglocska cba9f76764 chg: [CLI] updated noticelist response for no update needed 2018-07-09 16:17:58 +02:00