MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,751 Commits
33 Branches
364 Tags
186 MiB
Commit Graph

5358 Commits (7ac9cae7b6aa21eb7a8c4d492dc0e507ab4cb14a)

Author SHA1 Message Date
Jakub Onderka 7ac9cae7b6
Merge pull request #7539 from JakubOnderka/publishing-refactoring 
Refactor publishing event
 2021-07-27 20:52:17 +02:00
Jakub Onderka 180fb627cc chg: [internal] Convert array to const 2021-07-27 18:58:04 +02:00
iglocska e45245ec86
fix: [proposal alert email] function call fixed 2021-07-27 15:09:23 +02:00
Jakub Onderka e7565b5cb9 chg: [UI] After creating new org, redirect to org details 2021-07-26 13:35:33 +02:00
iglocska 26f9974865
Merge branch 'template_refactor' into develop 2021-07-23 11:30:11 +02:00
Jakub Onderka a9aad9c2c2
Merge pull request #7581 from JakubOnderka/simplified-template 
chg: [UI] Simplified generating categories that can be malware sample
 2021-07-22 09:32:04 +02:00
Jakub Onderka dc9ac1eec1
Merge pull request #7562 from JakubOnderka/warninglist-output 
fix: [API] Remove duplicate objects from warninglist
 2021-07-22 09:30:24 +02:00
Jakub Onderka 6fd1d3c18d
Merge pull request #7583 from JakubOnderka/code-cleanup-vol2 
Code cleanup
 2021-07-22 09:29:39 +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 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 cdcc96bd9c chg: [UI] Simplified generating categories that can be malware sample 2021-07-20 18:10:01 +02:00
mokaddem 7a01c4a813
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-16 15:15:11 +02:00
mokaddem e7fd73e50e
chg: [user:updateToAdvancedAuthKeys] Functionality accessible via the CLI 2021-07-16 15:13:55 +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 9b9392584d fix: [API] Always return bool for perm fields in getVersion response 2021-07-15 14:57:05 +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 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
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
Luciano Righetti a3dd6a850a fix: merge develop branch 2021-07-14 08:27:54 +02:00
Luciano Righetti cf73e33894 fix: fix pr comments: add warning notice for local feeds disabled on feeds/add, fix various ui elements. 2021-07-13 12:25:57 +02:00
Jakub Onderka 196b1ad895 fix: [API] Remove duplicate objects from warninglist 2021-07-12 13:38:46 +02:00
mokaddem 09b1534302
chg: [galaxies:view_relations] Both inbound and outbound relations can be viewed 2021-07-12 12:32:06 +02:00
mokaddem 52d6a2dc02
chg: [galaxyClusters:view] Both inbound and outbound relations can be viewed 2021-07-12 11:34:09 +02:00
Jakub Onderka 1a39e860d7 chg: [logs] Add link to SG and Taxonomy in AuditLog 2021-07-09 13:31:58 +02:00
Jakub Onderka f747d98877
Merge pull request #6817 from JakubOnderka/upload-sightings 
chg: [sync] New separate method for uploading sightings to remote server
 2021-07-09 12:25:16 +02:00
Jakub Onderka b62c95389c
Merge pull request #7157 from JakubOnderka/sighting-push-filtering 
new: [sync] Method for filtering out existing sightings
 2021-07-09 12:19:32 +02:00
Jakub Onderka 88fa652c48
Merge pull request #7558 from JakubOnderka/taxonomy_export 
new: [API] Taxonomy export
 2021-07-09 10:50:25 +02:00
Jakub Onderka 3b2defb094
Merge pull request #7553 from JakubOnderka/stix-diagnostics 
chg: [diagnostic] STIX diagnostics
 2021-07-09 10:43:47 +02:00
mokaddem a64bc45afc
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-08 15:39:20 +02:00
mokaddem 4e1a6c5221
fix: [attribute:edit] Make sure event_id cannot be changed 2021-07-08 15:38:22 +02:00
mokaddem 36cc125ec2
fix: [tags:detachFromObject] Make travis test passes 2021-07-08 15:26:30 +02:00
mokaddem 29a6148064
Merge remote-tracking branch 'origin/develop' into fix-5806 2021-07-08 14:39:10 +02:00
mokaddem 7d9eb35b93
fix: [tag] Update object's timestamp and unpublish only if in global context 
Fix #5806
 2021-07-08 14:38:25 +02:00
Jakub Onderka f0dcc9f9ce chg: [internal] Disable unicode escaping for JSON 2021-07-08 12:37:50 +02:00
Jakub Onderka eafc213324 new: [API] Taxonomy export 2021-07-08 12:18:26 +02:00
Luciano Righetti 7c807dfec8 fix: fix pr comments: replace whitelist->allowlist, checkbox label inline, add missing feed fields for csv and freetext. add missing button for adding basic auth headers. 2021-07-08 11:55:42 +02:00
Jakub Onderka 2a7ca18442 chg: [API] Refactor event publishing 2021-07-07 19:41:50 +02:00
Jakub Onderka 2be145fcf0 chg: [diagnostic] STIX diagnostics 2021-07-07 14:02:37 +02:00
Jakub Onderka d48ea5bef1 chg: [internal] Use standardized response output 2021-07-07 12:38:49 +02:00
Jakub Onderka 4d072b6e03 chg: [internal] Remove redundant checks 2021-07-07 12:38:49 +02:00
Jakub Onderka 6e61258e0d fix: [API] Check if user can view object that contains reference 2021-07-07 12:38:49 +02:00
Jakub Onderka a1612722f1 fix: [UI] Trim object UUID when adding reference 2021-07-07 12:38:49 +02:00
Jakub Onderka 42b62fb3da fix: [internal] Change exception type 2021-07-07 12:38:49 +02:00
Jakub Onderka c14e070912 fix: [internal] Relationship import 2021-07-07 12:38:49 +02:00
Jakub Onderka 10cd1ed65d chg: [internal] Remove JS helper from controllers 2021-07-02 10:04:10 +02:00