MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
16,562 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

1545 Commits (5c16ceb9d4c632a254ce222fea49a3ad6233481b)

Author SHA1 Message Date
mokaddem b628e15eb9
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-10-09 14:54:47 +02:00
Jakub Onderka c29729a9a4
Merge pull request #6388 from JakubOnderka/attribute-search-optim 
chg: [internal] Much faster attribute search
 2020-10-06 13:26:02 +02:00
Jakub Onderka 4a7eded184 chg: [internal] Much faster attribute search 2020-10-06 10:46:43 +02:00
mokaddem 22ced01083
chg: [events] Simplified attribute_count condition for `minimal` filter 
parameter
 2020-10-05 09:49:56 +02:00
Jakub Onderka 617c7ef475 chg: [internal] Clean up EventsController::view code 2020-10-04 13:16:33 +02:00
Jakub Onderka e379a218ea chg: [internal] Remove not necessary GalaxyCluster initialization 2020-10-04 13:02:44 +02:00
Jakub Onderka 7173663c19 chg: [internal] Move getting missing tlds list to model 2020-10-03 10:17:05 +02:00
Jakub Onderka bbb08e4074 new: [warninglist] Cache warninglist results 2020-10-03 10:17:05 +02:00
mokaddem 02725982cc
Merge branch '2.4' of github.com:MISP/MISP into feature-event-report 2020-10-01 10:38:28 +02:00
mokaddem 8087004922
chg: [events:index] Minimal searches returns events having event reports 
and no attributes
 2020-09-29 08:05:13 +02:00
Jakub Onderka 03b5af1f78
Merge pull request #6344 from JakubOnderka/misp-file-import 
Misp file import error message
 2020-09-26 19:34:55 +02:00
Jakub Onderka 8416f9d9a6 fix: [UI] Show error for user if file for import is invalid 2020-09-26 13:17:28 +02:00
Jakub Onderka 804525a20e chg: [internal] Move addMISPExportFile from controller to model 2020-09-26 13:02:19 +02:00
Jakub Onderka 88d45d869e fix: [UI] Show proper menu when using even import module 2020-09-25 09:13:59 +02:00
Jakub Onderka aa613d0369 chg: [UI] Show event creator for users within event org 2020-09-22 17:10:58 +02:00
Jakub Onderka d88cc19a21 chg: [mail] Simplified mail generation 2020-09-21 13:17:00 +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
mokaddem c3ef75fcba
chg: [events:recover_event] Adapt flash message if mock query requested 2020-09-18 15:49:48 +02:00
iglocska 09e2b56260
fix: [merge issue] resolved 2020-09-18 13:55:53 +02:00
iglocska d7b93b46ab
Merge branch 'event_recovery' of github.com:MISP/MISP into event_recovery 2020-09-18 13:53:40 +02:00
iglocska c8b61175e8
new: [recovery] script added mock method among other changes 
- also added proposals
- add/accept/discard should be fully supported now
 2020-09-18 13:42:52 +02:00
mokaddem ca61d45441
chg: [event] Forced usage of worker for event recovery 2020-09-16 10:33:05 +02:00
mokaddem f86ad11bd1
chg: [events] Usage of `fix_login` in restoreDeletedEvents 2020-09-16 10:01:31 +02:00
iglocska 19d52f312a
new: [recovery] added event deletion recovery tool 2020-09-15 23:54:59 +02:00
iglocska 5d3dee3ba2
fix: [tag filters] fixed a bug introduced with the previous filter fix, resulting in multiple OR tags being ignored as a valid filter 2020-09-12 11:54:49 +02:00
iglocska 0455b16f70
fix: [cleanup] 2020-09-10 15:22:26 +02:00
iglocska 7186ee6ce4
fix: [cleanup] 2020-09-10 15:22:02 +02:00
iglocska c0498b4aa5
fix: [string concat] fix 2020-09-10 15:20:43 +02:00
iglocska 2c7e9af9cb
fix: [cleanup] debug 2020-09-10 15:16:47 +02:00
iglocska 77855e14b3
fix: [internal] Correctly handle positive tag filters for non site admins 
- tag filters were ignored incorrectly when it was a positive lookup
 2020-09-10 15:15:39 +02:00
Jakub Onderka 565f446f19 chg: [internal] Faster tag fetching for events 2020-09-07 17:07:12 +02:00
Jakub Onderka 2f6f97e36e
Merge pull request #6274 from JakubOnderka/acl_filter_attribute_values 
fix: [internal] Respect ACL for event attribute search
 2020-09-02 17:24:16 +02:00
Jakub Onderka 4d819452e4 fix: [internal] Respect ACL for event attribute search 2020-09-02 16:49:45 +02:00
Jakub Onderka 713b228709
Merge pull request #6219 from JakubOnderka/event-small-optim 
Event small optim
 2020-09-01 20:03:22 +02:00
Jakub Onderka f3feb997bf chg: [internal] Deduplicate code for event conditions 2020-09-01 20:01:57 +02:00
Jakub Onderka 951c9f1033
Merge pull request #6271 from JakubOnderka/faster_quick_filter 
chg: [internal] Much faster quick filter
 2020-09-01 20:00:39 +02:00
Jakub Onderka be11e36c11 chg: [internal] Much faster quick filter 2020-09-01 18:37:26 +02:00
Golbark 3a0bedb104 chg: [internal] Using Allowedlist instead of Whitelist 2020-09-01 16:28:20 +02:00
Golbark 3fb47d1cce chg: [internal] Using blocklist instead of blacklist 2020-09-01 16:27:36 +02:00
Jakub Onderka d3eb86553b chg: [internal] Less SQL queries for event index page 2020-08-24 16:27:27 +02:00
Jakub Onderka 0737253d4a chg: [internal] Distribution is checked by SQL 2020-08-24 16:27:12 +02:00
Jakub Onderka 5232a8d251 chg: [internal] Remove not necessary code 2020-08-24 16:27:01 +02:00
Vito Piserchia 6af706947c syntax check and fix 2020-08-17 19:10:15 +02:00
Vito Piserchia 8486ecb8b4 Merge remote-tracking branch 'upstream/2.4' into baseurl-patch 2020-08-17 17:29:38 +02:00
Vito Piserchia eeb3c3b7d0 rebase continue 2020-08-17 17:19:16 +02:00
Vito Piserchia a393d411e1 rebase continue 2020-08-17 17:13:58 +02:00
Vito Piserchia dad45e68ca rebase continue 2020-08-17 15:52:32 +02:00
Jakub Onderka c41c1d5cc4 chg: [UI] Nicer tag removal confirmation 2020-08-16 16:23:20 +02:00
Vito Piserchia a1c80378f6 more merge fixes 2020-08-16 13:44:53 +02:00
Vito Piserchia b8c7485712 resolve merge 2020-08-16 13:31:31 +02:00