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

19798 Commits (ade3d78d981efa23d93c20102d2e17af5f779e3c)

Author SHA1 Message Date
Jakub Onderka 525339e333 chg: [internal] Remove unused method 2021-07-21 17:57:25 +02:00
Jakub Onderka 84a9b004cd chg: [internal] Remove unnecessary method calls 2021-07-21 17:54:17 +02:00
Jakub Onderka 5f48fee84a chg: [internal] Move variable from AppModel to Server model 2021-07-21 17:53:47 +02:00
Luciano Righetti 2e8e013cd0 chg: reuse add view for /templates/edit 2021-07-21 15:07:58 +02:00
Luciano Righetti 57bb08d59e chg: migrate /templates/add view to factory 2021-07-21 11:54:20 +02:00
Luciano Righetti 08e80160ed fix: add view action to index templates 2021-07-21 11:13:12 +02:00
Luciano Righetti e7ae9df6a3 chg: migrate /templates/index view, use CRUD compoenent in TemplatesController::delete() 2021-07-21 11:04:28 +02:00
Jakub Onderka 71bb08bf6a
Merge pull request #7538 from JakubOnderka/js-helper 
chg: [internal] Remove JS helper from controllers
 2021-07-21 10:40:11 +02:00
Jakub Onderka 6440133989 chg: [internal] Convert variable to const 2021-07-21 09:32:51 +02:00
Jakub Onderka bf9ee25239 fix: [internal] Remove unused variable 2021-07-21 09:32:51 +02:00
Luciano Righetti 760227c8cd Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-21 09:14:27 +02:00
Luciano Righetti 354d733094 fix: add missing search parameters for [POST]/events/index 2021-07-21 09:13:57 +02:00
Cooper Dale 6013adfda9
updated suricata legacy modifiers 
based on https://suricata.readthedocs.io/en/suricata-6.0.3/rules/tls-keywords.html?highlight=tls_sni#tls-sni
https://suricata.readthedocs.io/en/suricata-6.0.3/rules/http-keywords.html#http-keywords
https://suricata.readthedocs.io/en/suricata-6.0.3/rules/dns-keywords.html
 2021-07-21 08:20:21 +02:00
Alexandre Dulaunoy d426c8ec31
Merge pull request #7578 from Cooper-Dale/patch-1 
updated suricata legacy modifiers
 2021-07-21 07:56:11 +02:00
Jakub Onderka b32d68ac9d fix: [internal] Remove unused variable 2021-07-20 18:10:01 +02:00
Jakub Onderka 02ad3866cf chg: [internal] Use constants that should be faster 2021-07-20 18:10:01 +02:00
Jakub Onderka cdcc96bd9c chg: [UI] Simplified generating categories that can be malware sample 2021-07-20 18:10:01 +02:00
Luciano Righetti 3e6466b366 fix: add mass selector for deleting event blocklists. 2021-07-20 17:04:03 +02:00
Luciano Righetti 7127bc3524 chg: migrate /event_blocklist/add,edit to view factory. 2021-07-20 16:06:45 +02:00
Luciano Righetti 7d11b193ff chg: migrate /event_blocklists/index to view factory 2021-07-20 14:06:54 +02:00
Cooper Dale 9d862b24f3
updated suricata legacy modifiers 
based on https://suricata.readthedocs.io/en/suricata-6.0.3/rules/tls-keywords.html?highlight=tls_sni#tls-sni
https://suricata.readthedocs.io/en/suricata-6.0.3/rules/http-keywords.html#http-keywords
https://suricata.readthedocs.io/en/suricata-6.0.3/rules/dns-keywords.html
 2021-07-20 13:38:20 +02:00
Alexandre Dulaunoy e47d123103
chg: [misp-warninglists] updated to the latest version 2021-07-19 23:04:22 +02:00
Luciano Righetti 4ef0826554 fix: add missing newline. 2021-07-19 13:41:24 +02:00
Luciano Righetti c7799a442f fix: rename container div. 2021-07-19 13:39:56 +02:00
Luciano Righetti b1f93abf03 chg: migrate threads/index to factory view. 2021-07-19 11:26:52 +02:00
mokaddem 7a01c4a813
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-16 15:15:11 +02:00
mokaddem 1ed8c34d31
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-16 15:14:42 +02:00
mokaddem e7fd73e50e
chg: [user:updateToAdvancedAuthKeys] Functionality accessible via the CLI 2021-07-16 15:13:55 +02:00
iglocska a927868415
Merge branch 'shibb' into develop 2021-07-16 12:37:08 +02:00
mzp e1fee78dd5 Block org modiufication option for shibb auth. 2021-07-16 11:40:16 +02:00
Jakub Onderka b28b301c4a
Merge pull request #7560 from JakubOnderka/audit-sg 
Add link to SG and Taxonomy in AuditLog
 2021-07-16 10:13:57 +02:00
Jakub Onderka f8bcdd1309
Merge pull request #7566 from JakubOnderka/getversion-bool 
fix: [API] Always return bool for perm fields in getVersion response
 2021-07-16 10:10:15 +02:00
Jakub Onderka cd03e41688 chg: [zmq] Convert array to JSON at one place 2021-07-16 10:09:03 +02:00
Jakub Onderka 7f3529d136 fix: [zmq] Add missing `misp_json_warninglist` topic to Python script 2021-07-16 10:08:41 +02:00
Jakub Onderka 9b9392584d fix: [API] Always return bool for perm fields in getVersion response 2021-07-15 14:57:05 +02:00
Luciano Righetti 2380dfc453
Merge pull request #7357 from righel/refactor-noticelists-controller-to-use-crud-component 
chg: refactor noticelists controller to use crud component
 2021-07-15 14:50:28 +02:00
Luciano Righetti 07f1683be6 fix: nest noticelist entries inside Noticelist property 2021-07-15 13:59:05 +02:00
Luciano Righetti 0a8347983a fix: add noticelist entries in view response 2021-07-15 11:11:56 +02:00
Luciano Righetti 0b63a9e336 fix: undefined index notice when enable/disable noticelist 2021-07-15 10:32:36 +02:00
Luciano Righetti 7cd88e6477 merge develop 2021-07-14 16:36:45 +02:00
Luciano Righetti 08536c84ce
Merge pull request #7520 from righel/migrate-feeds-controller-to-crud-component 
chg: migrate feeds controller to crud component
 2021-07-14 15:13:09 +02:00
Luciano Righetti 59fd5b4635 fix: remove unsused field 2021-07-14 14:15:14 +02:00
mokaddem 572401311c
Merge branch 'pr-7551' into develop 2021-07-14 11:32:22 +02:00
mokaddem f42a2eb7a1
Merge remote-tracking branch 'origin/develop' into pr-7551 2021-07-14 11:31:08 +02:00
mokaddem bb72a83ddf
chg: [mispObject:breakOnDuplicate] Provide more feedback 2021-07-14 11:30:31 +02:00
mokaddem f841cfbc90
chg: [config] Added missing options 
Fix #7549
 2021-07-14 10:53:44 +02:00
mokaddem 6eceb3b8ce
fix: [config] Fixed indentation 2021-07-14 10:33:20 +02:00
mokaddem 5f49ec5332
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-14 10:13:43 +02:00
mokaddem 4c85a2aae0
fix: [tags:attachTagToObject] No longer return a failure message is relation already exists 
Fix #6569
 2021-07-14 10:11:48 +02:00
Jakub Onderka 08094fd0f7
Merge pull request #7433 from JakubOnderka/sync-clusters-error-handling 
fix: [sync] Better error handling when fetching IDs for push/pull
 2021-07-14 09:08:48 +02:00