MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
16,297 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

16297 Commits (8087004922a190b7cd52e606a3305b4c4d2c4a5a)

Author SHA1 Message Date
mokaddem 8087004922
chg: [events:index] Minimal searches returns events having event reports 
and no attributes
 2020-09-29 08:05:13 +02:00
mokaddem 6aab30c871
chg: [appmodel] Make sure to trigger the event report db update 2020-09-28 15:53:12 +02:00
mokaddem 4408a17dff
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-09-22 10:15:22 +02:00
mokaddem 98eb9c3ceb
chg: [eventreport] Make sure the format is correct when capturing 2020-09-22 10:05:22 +02:00
mokaddem c9ef9ce310
fix: [eventReport] Do not ignore `false` fields when editing 2020-09-22 09:31:34 +02:00
mokaddem 4f8bdcb144
chg: [eventReport] Includes event data when fetching event report from 
non-admin users
 2020-09-22 09:31:03 +02:00
mokaddem ffedb4cbbb
fix: [event] Delete event report when deleting event 2020-09-22 09:30:16 +02:00
iglocska 650f32144c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-09-22 09:15:27 +02:00
iglocska 8c07d01302
new: [workers] add kill all / force kill all buttons to the worker management, fixes #6329 2020-09-22 09:15:03 +02:00
mokaddem 3b15038ab5
chg: [eventReports] Improved returned data from controller 2020-09-22 08:31:14 +02:00
mokaddem 9f419073c1
chg: [restResponseComponent] Allow saveFailResponse and 
saveSuccessResponse to return data
 2020-09-22 08:30:22 +02:00
Jakub Onderka 82fd459420
Merge pull request #6328 from JakubOnderka/role-ui-full-label 
chg: [UI] Show full title for role permission
 2020-09-21 18:59:44 +02:00
Jakub Onderka 0195de2c7b chg: [UI] Show full title for role permission 2020-09-21 17:25:42 +02:00
mokaddem bc501fcbb0
chg: [markdownEditor] Split eventReport related code to their own files 2020-09-21 15:27:11 +02:00
mokaddem b624df66ca
chg: [markdownEditor] Move markdown editor to a generic file name 2020-09-21 13:56:17 +02:00
Jakub Onderka cb424fac50
Merge pull request #6090 from JakubOnderka/tlp-uppercase 
chg: [mail] Refactor email generating
 2020-09-21 13:51:52 +02:00
Jakub Onderka 77833be960 chg: [mail] Another code cleanup for alert and contact mails template 2020-09-21 13:17:00 +02:00
Jakub Onderka 28b6e73aa8 chg: [mail] Use same format for contact email as for alert 2020-09-21 13:17:00 +02:00
Jakub Onderka f1cf6191a0 chg: [mail] Add unsubscribe info also for non encrypted mails 2020-09-21 13:17:00 +02:00
Jakub Onderka d88cc19a21 chg: [mail] Simplified mail generation 2020-09-21 13:17:00 +02:00
Jakub Onderka 76b2a51253 fix: [ACL] Permissions when sending contact and alert emails 2020-09-21 13:17:00 +02:00
Jakub Onderka 1347940d4f chg: [mail] Cleanup mail sending code for event alerts 2020-09-21 13:16:58 +02:00
Jakub Onderka 05118ba2bc chg: [mail] TLP in subject should be uppercase 2020-09-21 13:14:56 +02:00
Jakub Onderka 6bf59c7856
Merge pull request #6327 from JakubOnderka/fix-object-conditons-vol2 
fix: [internal] Conditions when object distribution is set to org only
 2020-09-21 11:50:59 +02:00
mokaddem 5893a303de
fix: [eventReport] changed beforeFilter signature to avoid notice 2020-09-21 11:49:41 +02:00
mokaddem b78b13d428
chg: [eventReport] Added comments 2020-09-21 11:48:05 +02:00
Jakub Onderka 73cc4b7044 fix: [internal] Conditions when object distribution is set to org only 2020-09-21 11:33:19 +02:00
mokaddem c8c041a40d
chg: [eventReports] Prevent fields override 2020-09-21 11:27:33 +02:00
mokaddem 064ec80913
chg: [eventReport] Moved event unpublishing to model 2020-09-21 11:14:43 +02:00
mokaddem ca45c76c7b
chg: [eventReport] Started refactoring model - WiP 2020-09-21 11:01:36 +02:00
mokaddem bdd915607e
fix: [eventReports] Add view variables before rendering 2020-09-21 10:39:30 +02:00
mokaddem 473d8a9318
chg: [eventReports] Refactored indexes 2020-09-21 10:37:18 +02:00
Jakub Onderka ae5434fbc6
Merge pull request #6326 from JakubOnderka/fix-object-conditions 
Fix object conditions
 2020-09-21 09:50:09 +02:00
Jakub Onderka 32acd3895d chg: [internal] Simplify objects conditions 2020-09-20 19:02:57 +02:00
Jakub Onderka 3d4142f836 fix: [internal] Fetching objects with attachments 2020-09-20 18:54:04 +02:00
Jakub Onderka 08e2a18b2c chg: [internal] Use cached sharing groups IDs when fetching objects 2020-09-20 18:43:07 +02:00
Jakub Onderka f52eee457a fix: [internal] Remove duplicate check for published event when fetch objects 2020-09-20 18:34:38 +02:00
Jakub Onderka 6a017f63fe fix: [internal] Remove duplicate conditions for object restSearch 2020-09-20 18:20:23 +02:00
Jakub Onderka 8f897af503 fix: [internal] Code style 2020-09-20 18:20:23 +02:00
Jakub Onderka 636fc74d8a fix: [internal] Invalid conditions for sharing group when fetching objects 2020-09-20 18:20:23 +02:00
Jakub Onderka fdc3830c55 fix: [internal] Bad merge 2020-09-20 18:13:14 +02:00
iglocska c6104a979e
Merge branch 'event_recovery' into 2.4 2020-09-19 22:40:42 +02:00
iglocska 8e01caca62
Merge branch '2.4' into event_recovery 2020-09-19 22:28:28 +02:00
iglocska b5ee50d251
Merge branch 'event_recovery' of github.com:MISP/MISP into event_recovery 2020-09-19 18:37:35 +02:00
iglocska 94c37871da
fix: [recovery] various fixes 
- to_ids fixed
- background processing made optional
- first/last seen format conversion altering the data's format for the recovery script fixed
- added capture of object first/last seen to the recovery script
 2020-09-19 18:35:15 +02:00
Alexandre Dulaunoy c91fcfacb4
Merge pull request #6325 from rmkml/2.4 
fix #6266 vhash &
 2020-09-18 21:56:26 +02:00
rmkml b33193c4d0 fix #6266 vhash & 2020-09-18 20:40:04 +02:00
mokaddem f56cab6e49
chg: [log] Convert shadowAtribute's fs/ls into understood format 2020-09-18 16:51:53 +02:00
mokaddem e0bf738b11
chg: [log] Convert object's fs/ls into understood format 2020-09-18 16:41:26 +02:00
mokaddem 18097f05db
fix: [log:event_recovery] Delete blocklist entry for recovered event 2020-09-18 15:50:26 +02:00