19436 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

All Branches

Search

Author	SHA1	Message	Date
iglocska	a61caa3a6a	Merge branch 'develop' into 2.4	2021-06-07 17:26:35 +02:00
iglocska	943f7e6a0e	chg: [version] bump	2021-06-07 17:24:41 +02:00
iglocska	7d51694247	Merge branch 'develop' of github.com:MISP/MISP into develop	2021-06-07 17:23:52 +02:00
Raphaël Vinot	5f59653945	fix: [PyMISP] Bump pipenv	2021-06-07 08:01:17 -07:00
Alexandre Dulaunoy	c4de737aa7	chg: [Pip] lock updated	2021-06-07 17:00:15 +02:00
Raphaël Vinot	edc469a47d	chg: [PyMISP] Bump	2021-06-07 07:40:09 -07:00
iglocska	8ff015f97f	chg: [logo] reverted to the non-birthday version	2021-06-07 14:57:47 +02:00
Alexandre Dulaunoy	06b7811537	chg: [PyMISP] updated	2021-06-07 14:47:21 +02:00
iglocska	dd9f00e5e0	Merge branch 'develop' of github.com:MISP/MISP into develop	2021-06-07 14:46:18 +02:00
iglocska	a71aafdeb5	fix: [security] Always capture attribute sharing groups ... - via object edits it was omitted, leading to a possible misassociation of sharing groups by using the local ID of a referenced SG - as reported by Jeroen Pinoy	2021-06-07 14:44:36 +02:00
Alexandre Dulaunoy	f05a3c832b	Revert "Merge pull request #7476 from RichieB2B/ncsc-nl/org_blocklist" ... This reverts commit ea73d2613f, reversing changes made to 6d8c2eebcf.	2021-06-07 14:42:57 +02:00
Alexandre Dulaunoy	ea73d2613f	Merge pull request #7476 from RichieB2B/ncsc-nl/org_blocklist ... fix: [db] rename org_blacklists to org_blocklists everywhere	2021-06-07 14:31:25 +02:00
Alexandre Dulaunoy	6d8c2eebcf	chg: [misp-galaxy] updated to the latest version	2021-06-07 14:26:41 +02:00
Alexandre Dulaunoy	4013469905	chg: [misp-objects] updated to the latest version	2021-06-07 14:25:54 +02:00
Richard van den Berg	3a05c8d26e	fix: [db] rename org_blacklists to org_blocklists everywhere	2021-06-07 13:06:02 +02:00
mokaddem	d22fcdae66	Merge branch 'fix-dahsboard-updateSettings' into develop	2021-06-07 08:38:40 +02:00
mokaddem	f891ffb67a	Merge branch 'develop' of github.com:MISP/MISP into fix-dahsboard-updateSettings	2021-06-07 08:36:59 +02:00
mokaddem	61f08e3769	chg: [dashboard:updateSetting] Work with form data in memory rather than in HTML body	2021-06-07 08:19:07 +02:00
Alexandre Dulaunoy	a4c8a1d1ac	Merge pull request #7427 from righel/fix-add-feed-api-endpoint ... fix: /feeds/add endpoint returns empty 'name' error via api call	2021-06-05 10:22:41 +02:00
Raphaël Vinot	d0fb382545	chg: [PyMISP] Bump deps	2021-06-04 07:56:21 -07:00
mokaddem	0be447a02d	fix: [dashboard:update_settings] Added missing view	2021-06-04 16:41:23 +02:00
mokaddem	9a81ddce49	fix: [dashbpard:updateSetting] Usage of CSRF token	2021-06-04 16:35:32 +02:00
Andras Iklody	83ca1efd87	Merge pull request #7468 from righel/add-openapi-spec ... Add openapi spec	2021-06-04 15:57:33 +02:00
Luciano Righetti	2af550c860	fix: pr comments, update acl to allow all for /servers/openapi view, remove rest client from events menu, remove php7 return hint.	2021-06-04 15:54:13 +02:00
mokaddem	49bafc3c0d	Merge branch 'fix-event-view-attribute-toolbar' into develop	2021-06-04 15:34:11 +02:00
mokaddem	c2600b3c94	fix: [appController] Bumped queryversion	2021-06-04 15:33:40 +02:00
mokaddem	d11b8ca104	Merge branch 'fix-sg-api-edit' into develop	2021-06-04 15:23:09 +02:00
mokaddem	3820528edc	Merge remote-tracking branch 'origin/develop' into fix-sg-api-edit	2021-06-04 15:22:54 +02:00
mokaddem	bd26a1671c	fix: [event:__prepareForPushToServer] Slight refactoring	2021-06-04 15:22:06 +02:00
mokaddem	98499f6959	fix: [galaxyCluster:view] Use CyCat local icon	2021-06-04 15:16:37 +02:00
Andras Iklody	a5e422c52a	Merge pull request #7470 from mokaddem/improvements-cycat ... Improvements for cycat integration	2021-06-04 15:06:28 +02:00
mokaddem	35589995a1	fix: [events:view] Correctly support arrays passed as deleted parameter	2021-06-04 15:03:12 +02:00
Luciano Righetti	472eda4d90	add /users/initiatePasswordReset/[user_id]/[first_time] openapi spec.	2021-06-04 14:48:06 +02:00
mokaddem	4d22a03043	Merge branch 'develop' of github.com:MISP/MISP into fix-event-view-attribute-toolbar	2021-06-04 14:46:08 +02:00
mokaddem	eee298f19f	fix: [event:prepareForPush] Gracefully handle the case if SharingGroupServer is empty	2021-06-04 14:30:16 +02:00
mokaddem	d0fe839741	chg: [galaxyCluster:CyCat relations] Added icon and reference of the project	2021-06-04 11:21:41 +02:00
mokaddem	de9b368e78	chg: [genericElements:accordion] Added possiblity to pass html title	2021-06-04 11:21:10 +02:00
mokaddem	8adea4a732	chg: [cluster:cycat_relations] Added missing view	2021-06-04 11:20:50 +02:00
Alexandre Dulaunoy	19aa7e23bf	chg: [warning-lists] updated to the latest version	2021-06-04 11:04:12 +02:00
mokaddem	78a2298a84	Merge remote-tracking branch 'origin/2.4' into develop	2021-06-04 11:03:27 +02:00
mokaddem	8084faabdc	fix: [post:send_mails] Make sure to have full group_by	2021-06-04 10:37:31 +02:00
mokaddem	ffb3d9409b	chg: [galaxyCluster:view] oved CyCat relationships in their own child elements ... - Significantly speed up view loading time	2021-06-04 10:16:23 +02:00
mokaddem	355952f8de	fix: [galaxyCluster:view] Make sure the cluster contain cycat relations before inserting content	2021-06-04 09:35:40 +02:00
mokaddem	6a7b2f20b7	fix: [galaxyCluster:view] Typo in setting name	2021-06-04 09:34:55 +02:00
mokaddem	0a68e339e8	chg: [sharinggroup] Allow pushing SG if remote internal server is not in the list of SG servers	2021-06-04 08:34:47 +02:00
iglocska	cda48b006e	Merge branch 'develop' of github.com:MISP/MISP into develop	2021-06-04 00:12:29 +02:00
iglocska	22d4c14b48	new: [CyCat integration] v1 ... - lookup on relationshis for a given galaxy cluster	2021-06-04 00:11:55 +02:00
Luciano Righetti	07f6ce2f17	fix openapi errors, fix default organisation restricted_to_domain value	2021-06-03 18:26:42 +02:00
Luciano Righetti	546aacec2c	new: add initial version of openapi spec, add ReDoc js files.	2021-06-03 17:49:36 +02:00
mokaddem	e0e84cd79c	Merge branch 'fix-composite-attribute-filtering' into develop	2021-06-03 16:11:28 +02:00