MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
18,990 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

784 Commits (74acfacde01918f46a088632a9b69bc0a81ab64f)

Author SHA1 Message Date
Jakub Onderka 74acfacde0 Revert "chg: [internal] Install CakePHP by Composer" 
This reverts commit 74eccfe9
 2021-04-19 13:31:43 +02:00
Jakub Onderka d3b1eb51fb Revert "chg: [internal] Install random_compat by Composer" 
This reverts commit fe7d0a46
 2021-04-19 13:17:20 +02:00
Jakub Onderka 742e83f84d
Merge pull request #7294 from JakubOnderka/cakephp-composer 
chg: [internal] Install CakePHP by Composer
 2021-04-03 13:04:53 +02:00
Jakub Onderka a1fb8f839c
Merge pull request #7267 from JakubOnderka/fix-xml-empty-object 
fix: [xml] Object can be without attributes
 2021-04-03 13:01:45 +02:00
Jakub Onderka fe7d0a462d chg: [internal] Install random_compat by Composer 2021-04-03 12:20:21 +02:00
Jakub Onderka 74eccfe919 chg: [internal] Install CakePHP by Composer 2021-04-03 12:20:21 +02:00
iglocska d52702aaa4
Merge branch '2.4' into develop 2021-04-01 17:04:10 +02:00
iglocska 3bb471b2bc
fix: [emailing] subject restored 
- view template not having the subject var set defaulted the subject to null
 2021-04-01 17:01:27 +02:00
Jakub Onderka 0dfd79be1c fix: [xml] Object can be without attributes 2021-03-29 14:14:22 +02:00
Jeroen Pinoy 3005829119
new: [Dashboard] Add usage data widget 2021-03-27 13:30:47 +00:00
Jakub Onderka 0b0b71e8f5
Merge pull request #7181 from JakubOnderka/freetext-speedup 
new: [freetext] Faster freetext parsing with more tests
 2021-03-18 20:44:51 +01:00
iglocska 5a917f008f
Merge branch '2.4' into develop 2021-03-16 23:15:30 +01:00
iglocska b773361561
fix: [refanging] Removed obnoxious regexes, fixes #7214 
- refanging \\. and .. to . is a stupid idea
 2021-03-16 23:14:48 +01:00
Jakub Onderka b17ddeaf70 chg: [feed] Check if value is clean IP without doing expensive operations 2021-03-15 10:51:48 +01:00
Jakub Onderka fc3924c8e8 new: [freetext] Faster freetext parsing with more tests 2021-03-09 16:58:12 +01:00
mokaddem f95babb980
Merge branch 'develop' of github.com:MISP/MISP into eventgraph-node-coloring 2021-03-09 10:49:22 +01:00
mokaddem 3b4f61c884
chg: [eventGraph] Improved object coloring strategy 2021-03-09 10:48:06 +01:00
Jakub Onderka f140de17f2 fix: [email] Correct Content-Type header for alternative content 2021-03-06 10:39:16 +01:00
Jakub Onderka 9f81f0fb65 fix: [email] Correctly set domain for email message ID 2021-03-06 10:39:16 +01:00
Jakub Onderka d523025b6d new: [email] Command for testing generated alert email 2021-03-06 10:39:16 +01:00
Jakub Onderka 0d493efb1b chg: [email] Move event alert email subject generting 2021-03-06 10:39:16 +01:00
Jakub Onderka 9b9c69bfad new: [email] Allow to set email subject from template 2021-03-06 10:39:16 +01:00
Jakub Onderka 56508cce17 new: [mail] Add reference for event alert emails 2021-03-06 10:39:16 +01:00
Jakub Onderka 17fb5db3cf new: [mail] Move contact alert email to templates 2021-03-06 10:39:16 +01:00
Jakub Onderka e2b1ba18a3 new: [mail] HTML alert emails 2021-03-06 10:39:16 +01:00
Jakub Onderka 79e78b817f new: [mail] Backend support for sending HTML emails 2021-03-06 10:39:15 +01:00
iglocska 1156440b47
Merge branch '2.4' into develop 2021-03-05 12:22:16 +01:00
iglocska 4a4722a30c
chg: [security audit] removed sharing group recommendation and fixed grammar 
- the hide sharing group org setting is actively harmful, we should definitely not promote it
 2021-03-05 12:20:39 +01:00
iglocska fe1034b461
fix: [Freetext import] handle end of sentence periods and brackets better, fixes #7163 2021-03-05 11:57:00 +01:00
Jakub Onderka 062390ed83
Merge pull request #7155 from JakubOnderka/push-optim 
Push optim
 2021-03-04 19:12:31 +01:00
Jakub Onderka 27e58bbb2d chg: [sync] Do not decode body if is empty 2021-03-04 18:30:28 +01:00
Jakub Onderka 1b50258d04 fix: [diagnostics] Typo in security audit message 2021-03-04 12:56:39 +01:00
Jakub Onderka 2a8ba9020f new: [internal] Security setting force_https 2021-03-03 20:07:07 +01:00
iglocska e394cfbe66
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-03 17:24:36 +01:00
Jakub Onderka 7695b52f0f chg: [csp] Report only by default 2021-03-03 17:19:07 +01:00
Jakub Onderka 599819f7f9 new: [authkeys] Allowed IPs 2021-03-03 09:23:07 +01:00
iglocska 1830d5dc7b
Merge branch '2.4' into develop 2021-02-22 15:43:33 +01:00
Jakub Onderka f959907c4e
Merge pull request #7055 from JakubOnderka/fast-event-galaxies 
chg: [internal] Faster fetching galaxy clusters when fetching event
 2021-02-22 10:07:29 +01:00
Jakub Onderka 28b6a9066b chg: [internal] Faster fetching galaxy clusters when fetching event 2021-02-22 08:18:40 +01:00
Jakub Onderka 2ec82ebea3
Merge pull request #7050 from JakubOnderka/cluster-relation 
fix: [galaxy] GalaxyClusterRelation doesn't have Org and Orgc
 2021-02-21 17:05:52 +01:00
eCrimeLabs bc04f6966d Fix for #7040 and #7039 
The following commit contains the fix for ZeroMQ only listening on 0.0.0.0
 2021-02-21 14:50:43 +01:00
Jakub Onderka 170ea2c64d fix: [galaxy] GalaxyClusterRelation doesn't have Org and Orgc 2021-02-19 22:43:38 +01:00
mokaddem 50575cbb8b
fix: [securityAudit] Display python version 2021-02-19 16:01:49 +01:00
mokaddem f1d10ebbcf
Merge branch 'feature-reference-for-extended-event' into develop 2021-02-19 09:09:21 +01:00
Jakub Onderka 8342f4e8b4 new: [security] Security audit 2021-02-18 17:58:34 +01:00
mokaddem 5acf3e9fbe
Merge branch 'develop' into feature-reference-for-extended-event 2021-02-18 10:04:57 +01:00
mokaddem ad92322560
chg: [events:eventGraph] Improved hull algorithm and UI 2021-02-17 10:59:51 +01:00
iglocska 6fd2c4807a
fix: [dashboard] removed training example left in the code 
- restricted new module to only 3 user IDs
 2021-02-16 11:36:11 +01:00
Jakub Onderka 3b155d7c0f
Merge pull request #7011 from JakubOnderka/http-socket-fied-name 
fix: [internal] Field name in HttpSocketExtended
 2021-02-15 20:49:55 +01:00
Jakub Onderka 1b5c058733 fix: [internal] Field name in HttpSocketExtended 2021-02-15 20:06:06 +01:00