Commit Graph

20334 Commits (f87a3b8661ecd8e361b222ab4c36bcb5528176e1)

Author SHA1 Message Date
chrisr3d f87a3b8661 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-18 10:46:29 +02:00
Steve Clement 6779b33517
Merge pull request #7841 from SteveClement/guides 2021-10-15 08:20:07 +02:00
Steve Clement 4f653bb6d8
chg: [doc] Update to OpenBSD 7.0 2021-10-15 08:03:30 +02:00
Steve Clement 44543c6f58
Merge branch 'MISP:2.4' into guides 2021-10-15 07:57:07 +02:00
Alexandre Dulaunoy 2224529571
Merge pull request #7840 from amuehlem/2.4
added 'git submodule sync' before 'git submodule update'
2021-10-14 18:16:42 +02:00
Andreas Muehlemann 4be25f0c14
added 'git submodule sync' before 'git submodule update' 2021-10-14 17:32:40 +02:00
iglocska 932a94f623
fix: [event index] search by org fixed when using string names, fixes MISP/PyMISP#799 2021-10-14 14:20:26 +02:00
iglocska 1e930903b2
Merge branch 'develop' into 2.4 2021-10-12 16:26:05 +02:00
iglocska fad8ee23a1
chg: [version] bump 2021-10-12 16:17:46 +02:00
iglocska 0d82df3e4c
Merge branch 'attribute_index' into develop 2021-10-12 16:13:03 +02:00
iglocska cb20a9e1d9
fix: [attribute index] fixed attribute tag widget
- notice errors due to missing variables in the closure
2021-10-12 16:12:15 +02:00
iglocska c7493a5e0d
fix: [attribute index] fix galaxy widget for the attribute index
- notice errors when logged in as a user
2021-10-12 15:57:53 +02:00
iglocska d93a683f15
fix: [attribute index] action ACL fixed 2021-10-12 15:34:59 +02:00
iglocska 10005f3774
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-10-12 15:12:15 +02:00
iglocska 4695a1d3f7
Merge branch '2.4' into develop 2021-10-12 15:10:59 +02:00
iglocska 4822aad82c
Revert "fix: [internal] withCredentials property was added into $.ajaxSetup() to get rid of 403 and 302 responses"
This reverts commit b496161f5b.
2021-10-12 15:10:45 +02:00
Andras Iklody d0633c2f62
Merge pull request #7633 from righel/migrate-news-views
chg: migrate news views to factory.
2021-10-12 15:04:23 +02:00
iglocska 0ae53cc1f1
chg: [queryversion] bump 2021-10-12 15:02:34 +02:00
iglocska 36b4300f04
Merge branch '2.4' into develop 2021-10-12 15:02:03 +02:00
Andras Iklody f44b125ab2
Merge pull request #7818 from MrBoba/fix-unauthorized-ajax
fix: [internal] withCredentials property was added into $.ajaxSetup()…
2021-10-12 15:01:17 +02:00
Jakub Onderka b52962b2a2
Merge pull request #7833 from JakubOnderka/fix-local-tags
fix: [internal] Fix saving tags
2021-10-12 12:24:23 +02:00
Jakub Onderka 742f01a8a9 fix: [internal] Fix saving tags 2021-10-12 12:01:06 +02:00
Andras Iklody 53fe050b55
Merge pull request #7831 from marjatech/marjatech-local-tag-import
fix: keep tag local state when importing from json or sync from internal
2021-10-12 11:51:08 +02:00
misp-test d25c8e7b2f keep tag local state when importing from json or sync from internal
Fixes MISP#7810
When importing an Event via JSON, local tags inside the json should stay local after import too, and not be attached as global ones.
Same applies for Sync-Operations from internal instances (for any other instance local tags get stripped anyway)
2021-10-12 11:05:44 +02:00
Jakub Onderka d74343b7b6
Merge pull request #7830 from JakubOnderka/audit-log-undefined-index
fix: [log] Undefined index local
2021-10-12 09:55:41 +02:00
Jakub Onderka b5856d6f73 chg: [log] Log when saving tags fails for attribute or event 2021-10-12 09:25:15 +02:00
Jakub Onderka 60ac21e252 fix: [log] Undefined index local 2021-10-12 09:14:28 +02:00
Alexandre Dulaunoy b3017cc06a
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-10-12 07:19:40 +02:00
Alexandre Dulaunoy e7c842d25f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-10-12 07:19:11 +02:00
Alexandre Dulaunoy da6d5aaa12
chg: [MISP/cakephp] updated - to get latest CA bundle 2021-10-12 07:18:33 +02:00
chrisr3d 0d4e8ed80b
chg: [github actions] Enabling tests on the `misp-stix` branch (at least temporarily) 2021-10-11 18:52:35 +02:00
chrisr3d f0c7da0c38
fix: [github actions] For the tests purpose, installing the stix1 python library from the submodule 2021-10-11 18:15:38 +02:00
chrisr3d 605abf5c35
fix: [gitignore] Removed directories related to python libraries 2021-10-11 18:12:48 +02:00
chrisr3d ecd350ad9e
fix: [stix python install] Added STIX python dependencies to the install 2021-10-11 18:05:47 +02:00
chrisr3d f230d8fb2d Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-11 14:44:28 +02:00
Jakub Onderka 5246b4269d
Merge pull request #7826 from JakubOnderka/new-submodules
chg: [internal] Add new submodules to diagnostics page
2021-10-11 12:51:08 +02:00
Jakub Onderka b4ea6c1665
Merge pull request #7827 from JakubOnderka/upload-stix-existing-uuid
chg: [UI] Show proper error when uploading event that already exists
2021-10-11 12:50:51 +02:00
Jakub Onderka 6aee82112b chg: [UI] Show proper error when uploading event that already exists 2021-10-11 12:15:34 +02:00
Jakub Onderka 7fd45b4b11 chg: [internal] Add new submodules to diagnostics page 2021-10-11 11:52:42 +02:00
Jakub Onderka 7112a0aecf
Merge pull request #7798 from JakubOnderka/feed-etag
chg: [feed] Check ETag when fetching freetext feed
2021-10-11 10:28:24 +02:00
Jakub Onderka af15ea4934 chg: [feed] Move feed cache to proper folder 2021-10-11 10:23:08 +02:00
Jakub Onderka c1c179dcff chg: [feed] Use FileAccessTool 2021-10-11 10:23:08 +02:00
Jakub Onderka 72f180c0af chg: [feed] Simplified code for updating events from MISP feed 2021-10-11 10:23:08 +02:00
Jakub Onderka 8a4628c7e2 chg: [feed] Support unicode for feed preview search 2021-10-11 10:23:08 +02:00
Jakub Onderka 629b711524 chf: [feed] Cache MISP feed manifest file 2021-10-11 10:23:08 +02:00
Jakub Onderka 8a8f5095ee chg: [feed] Faster saving freetext attributes 2021-10-11 10:23:08 +02:00
Jakub Onderka b26f0e435b chg: [feed] Clean cache after feed modification 2021-10-11 10:23:08 +02:00
Jakub Onderka bf89ef2231 chg: [feed] Check ETag when fetching freetext feed 2021-10-11 10:23:08 +02:00
Jakub Onderka 2e6c44e5b2
Merge pull request #7824 from JakubOnderka/code-cleanup-vol9
Code cleanup vol9
2021-10-11 09:58:30 +02:00
Jakub Onderka 618c5cf52a chg: [internal] Use hasAny for Org::canSee method 2021-10-11 09:41:46 +02:00