25378 Commits (708d18174af0cf9a38e6358bec10ff24656a86c4)

All Branches

Search

Author	SHA1	Message	Date
iglocska	708d18174a	Merge branch 'develop' into 2.4	2024-02-29 15:49:21 +01:00
iglocska	8f85bda6bb	fix: [schema] fixed	2024-02-29 15:33:47 +01:00
Sami Mokaddem	5c21896d96	Merge branch 'develop' into 2.4	2024-02-29 14:53:20 +01:00
Sami Mokaddem	a4f0a6681b	fix: [event:_mergeExtension] Include analyst data on extension if originally requested in the request	2024-02-29 14:52:52 +01:00
iglocska	9c0ea04bb2	Merge branch 'develop' into 2.4	2024-02-29 14:36:47 +01:00
iglocska	970e4b6916	chg: [schema] dumped	2024-02-29 14:35:41 +01:00
Sami Mokaddem	6d7ba5ecfa	Merge remote-tracking branch 'origin/develop' into 2.4	2024-02-29 14:27:26 +01:00
Sami Mokaddem	e6dd70bd64	fix: [analyst-data:hasMoreNotesOrOpinions] Use correct model to fetch additional opinions	2024-02-29 14:24:45 +01:00
iglocska	c6710443e0	Merge branch 'develop' into 2.4	2024-02-29 11:19:51 +01:00
iglocska	334d3caac3	chg: [version] bump	2024-02-29 11:19:05 +01:00
iglocska	b870728f6b	fix: [analystdata] push and pull fixes ... - push: check sharing group data correctly - pull: Don't throw errors if not all 3 types of notes exist on the remote	2024-02-29 11:18:06 +01:00
Jakub Onderka	8854fa58b2	Merge pull request #9508 from JakubOnderka/redis-info ... new: [UI] Show dragonfly version in diagnostics	2024-02-28 13:53:59 +01:00
Jakub Onderka	23c6ad9091	Merge pull request #9594 from Wachizungu/fix-object-templates-misp-logo-display ... fix: [UI] Fix MISP logo display on object templates index	2024-02-28 13:53:34 +01:00
Jeroen Pinoy	c09d5861c6	fix: [UI] Fix MISP logo display on object templates index	2024-02-28 11:20:39 +01:00
Raphaël Vinot	7cd28317de	chg: [PyMISP] Bump	2024-02-28 00:25:04 +01:00
Christian Studer	d262767ab7	fix: [stix2 import] Making the organisation uuid argument specific to external STIX 2 import	2024-02-27 22:09:12 +01:00
Christian Studer	3d2e563c33	chg: [misp-stix] Bumped latest version	2024-02-27 17:46:29 +01:00
Christian Studer	fdfd783f0f	Merge branch 'develop' of github.com:MISP/MISP into develop	2024-02-27 17:39:43 +01:00
Alexandre Dulaunoy	7c66aa699c	chg: [warning-lists] updated to the latest version	2024-02-27 17:39:22 +01:00
Alexandre Dulaunoy	d66f6d90d5	chg: [misp-galaxy] updated to the latest version	2024-02-27 17:38:58 +01:00
iglocska	cf0910dc04	fix: [analystdata] removed invalid field from the change before the last	2024-02-27 09:06:15 +01:00
iglocska	4d8e04fd4c	fix: [analyst data blocklist] removed unused edit button	2024-02-27 09:04:55 +01:00
iglocska	060cf4f45d	fix: [analystdata] restrict what to display in associated models	2024-02-27 09:03:17 +01:00
iglocska	38c6ffd7a0	fix: [analystdata] fixed editing of context specific editable fields	2024-02-27 08:44:34 +01:00
iglocska	9f859892c2	fix: [analyst data] zero out sharing group ID when other distribution setting is selected	2024-02-27 08:24:24 +01:00
iglocska	27885e19ca	fix: [analystdata] clarified hover text	2024-02-27 07:24:48 +01:00
iglocska	ba08a8219b	fix: [analystdata ui] oversanitisation of relationships fixed	2024-02-27 07:21:15 +01:00
Alexandre Dulaunoy	d82387b376	chg: [misp-galaxy] updated	2024-02-24 18:17:34 +01:00
Alexandre Dulaunoy	8d1a74b40b	Merge branch '2.4' into develop	2024-02-24 13:46:09 +01:00
Alexandre Dulaunoy	e93beba4d3	Merge pull request #9588 from vincenzocaputo/fix-workflow-tag-replacement-module-description ... Fix Tag replacement workflow module description	2024-02-24 13:43:12 +01:00
Vincenzo Caputo	626fafc40f	Fix Tag replacement workflow module description	2024-02-24 11:31:17 +00:00
Christian Studer	7b5e75a1b5	fix: [stix2 import] Added missing `organisation_uuid` argument	2024-02-23 23:44:08 +01:00
Christian Studer	354da05e19	fix: [upload_stix] Fixed naive copy paste failing after an arbitrary variable name change	2024-02-23 22:44:38 +01:00
Christian Studer	71d1d5fc4a	Merge branch 'develop' of github.com:MISP/MISP into develop	2024-02-23 22:14:10 +01:00
Christian Studer	54c15476c6	Merge pull request #9440 from chrisr3d/develop ... Handling clusters distribution and sharing group for content imported from STIX 2.x	2024-02-23 22:13:36 +01:00
Christian Studer	5f6c1327ff	chg: [misp-stix] Bumped latest version with the changes on the organisation uuid argument	2024-02-23 21:42:38 +01:00
Christian Studer	41b20f96d3	add: [stix2 import] Added organisation UUID parameter to be used when generating custom Galaxy Clusters UUID	2024-02-23 21:41:08 +01:00
Christian Studer	1163539038	fix: [upload_stix] Fixed undefined index `cluster_sharing_group_id` when uploading stix file	2024-02-23 16:03:00 +01:00
Christian Studer	9221682157	Merge branch 'develop' of github.com:MISP/MISP into develop	2024-02-23 15:49:03 +01:00
Sami Mokaddem	105a6c39b0	Merge remote-tracking branch 'origin/2.4' into develop	2024-02-23 12:19:28 +01:00
Jakub Onderka	c07ee0066c	fix: [UI] Catch exception when custom file is not readable	2024-02-23 12:19:00 +01:00
Sami Mokaddem	78399abd03	Merge remote-tracking branch 'origin/2.4' into develop	2024-02-23 12:16:47 +01:00
Sami Mokaddem	f09fdad92d	Merge branch 'fix/custom-image-rendering' into 2.4	2024-02-23 12:10:39 +01:00
Sami Mokaddem	f9174e9a4d	Merge branch 'develop' of github.com:MISP/MISP into develop	2024-02-23 12:07:48 +01:00
Sami Mokaddem	abcbc575c1	fix: [users:login401] Usage of Image->base64 to follow what users:login does	2024-02-23 12:07:45 +01:00
Sami Mokaddem	7ad892a028	fix: [users:login401] Usage of Image->base64 to follow what users:login does	2024-02-23 12:06:49 +01:00
Alexandre Dulaunoy	b5d0f2407c	Merge branch '2.4' into develop	2024-02-23 12:06:09 +01:00
Alexandre Dulaunoy	5646474130	Merge pull request #9582 from cudeso/2.4 ... Minor documentation changes; add example to create users via REST API	2024-02-23 12:05:31 +01:00
Sami Mokaddem	af1ba18319	fix: [user:login] Make sure welcome_logos exists before trying to render them	2024-02-23 12:03:35 +01:00
Sami Mokaddem	6e06cf433c	fix: [user:login] Make sure welcome_logos exists before trying to render them	2024-02-23 12:00:26 +01:00