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

19751 Commits (7ac9cae7b6aa21eb7a8c4d492dc0e507ab4cb14a)

Author SHA1 Message Date
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
Luciano Righetti a3dd6a850a fix: merge develop branch 2021-07-14 08:27:54 +02:00
Luciano Righetti 443c98729c fix: fix ui issues on multiple views 2021-07-13 18:08:58 +02:00
Luciano Righetti dbacfeb56b fix: add missing input descriptions 2021-07-13 18:06:20 +02:00
mokaddem 18872a503d
fix: [organisations:view] Restored org logo 
Fix #7491
 2021-07-13 15:27:03 +02:00
mokaddem 1f403d60cf
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-13 15:22:49 +02:00
mokaddem 88b1772244
fix: [event:contact] User object passed in contact reporter 
Fix #7471
 2021-07-13 15:20:12 +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
Alexandre Dulaunoy f6b45c92ad
Merge branch '2.4' into develop 2021-07-13 09:26:10 +02:00
Alexandre Dulaunoy 689c3a58be
chg: [warning-lists] updated to the latest version 2021-07-13 09:25:43 +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
mokaddem ff6b07dcfe
chg: [genericElement:topbar] Support of raw html 2021-07-12 11:33:22 +02:00
Jakub Onderka e0ad718b4a fix: [UI] Do not use inline JS 2021-07-09 13:31:58 +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
Alexandre Dulaunoy 30c6003333
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-07-09 10:29:02 +02:00
Alexandre Dulaunoy c299387237
chg: [misp-galaxy] updated to the latest version 2021-07-09 10:28:32 +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
Luciano Righetti 7736b08f2f fix: add missing refresh to feed pull rules 2021-07-08 15:29:56 +02:00
mokaddem 36cc125ec2
fix: [tags:detachFromObject] Make travis test passes 2021-07-08 15:26:30 +02:00
Luciano Righetti fbf3a45b16 fix: fix issue when adding attribute, add optionalField class to inputs. 2021-07-08 15:20:30 +02:00
mokaddem cd4691e5ca
Merge branch 'fix-5806' into develop 2021-07-08 14:39:24 +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 77f99f7c3e new: [test] Security test for publishing events 2021-07-07 19:41:49 +02:00
Jakub Onderka bcbc34b3b8
Merge pull request #7530 from JakubOnderka/fix-relationship-import 
fix: [internal] Relationship import
 2021-07-07 18:12:58 +02:00
Jakub Onderka 9470c2a60d
Merge pull request #7555 from JakubOnderka/misp2stix_traceback 
new: [misp2stix2] Return traceback for error
 2021-07-07 14:21:32 +02:00
Jakub Onderka 2be145fcf0 chg: [diagnostic] STIX diagnostics 2021-07-07 14:02:37 +02:00
Jakub Onderka e0c5fb340b new: [misp2stix2] Return traceback for error 2021-07-07 13:38:27 +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 5b27fabc05 fix: [internal] Update object relationships when updating JSONs 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
Alexandre Dulaunoy fa681622d7
Merge remote-tracking branch 'origin' into develop 2021-07-07 12:28:34 +02:00