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

15561 Commits (18872a503d4d62188831546b8746ea24da78f889)

Author SHA1 Message Date
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
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
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 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
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
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
Alexandre Dulaunoy d345ba6761
chg: [misp-objects] updated to the latest version 2021-07-07 12:27:51 +02:00
Jakub Onderka 4fcc68e0a6
Merge pull request #7540 from MISP/2.4 
Merge 2.4 to develop to fix build
 2021-07-02 11:56:40 +02:00
Jakub Onderka 6847bfe6fa
Merge pull request #7532 from JakubOnderka/warninglist-quick-delete 
fix: [internal] Faster deleting warninglist
 2021-07-02 09:15:31 +02:00
Alexandre Dulaunoy 5568da12ba
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-01 17:36:12 +02:00
Alexandre Dulaunoy 24bcc09980
chg: [warning-list] updated 2021-07-01 17:35:55 +02:00
mokaddem 75512c557e
fix: [galaxies:add] Missing entry in sidebar 
Fix #7499
 2021-07-01 16:19:11 +02:00
mokaddem 7f72702b3f
fix: [galaxies:add] Missing entry in sidebar 
Fix #7499
 2021-07-01 16:07:45 +02:00
Jakub Onderka 30220e86da
Merge pull request #7525 from JakubOnderka/deprecate-getpymisp-version 
chg: [API] Deprecate getPyMISPVersion
 2021-07-01 09:42:30 +02:00
iglocska 671ebbf92d
Merge branch 'develop' into 2.4 2021-06-30 17:13:29 +02:00
Alexandre Dulaunoy 58b610ffed
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-30 16:20:23 +02:00
Alexandre Dulaunoy 3f449697eb
chg: [warning-lists] updated to the latest version 2021-06-30 16:19:59 +02:00
Jakub Onderka 46542d50be
Merge pull request #7533 from JakubOnderka/audit-log-ui-fix 
fix: [UI] Loading non exists library in Audit log index
 2021-06-30 15:42:34 +02:00
Jakub Onderka 0d86d72184 chg: [log] Remove ObjectRelationship from audit log 2021-06-30 15:28:38 +02:00
Jakub Onderka 1388f3f30b fix: [UI] Loading non exists library in Audit log index 2021-06-30 15:19:36 +02:00
Jakub Onderka 61106fc7c1 chg: [internal] Regenerate warninglist cache just when save was successful 2021-06-30 14:52:41 +02:00
mokaddem 166bc9a885
Merge remote-tracking branch 'origin/2.4' into develop 2021-06-30 12:43:03 +02:00
mokaddem 55243bf5c6
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-30 12:42:28 +02:00