MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
20,889 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

20889 Commits (741a74165efb415c744bfad7f7e8a4403113247a)

Author SHA1 Message Date
iglocska f06edfd03d
Merge branch '2.4' into develop 2021-11-10 11:25:45 +01:00
iglocska fb6408dd4f
fix: [email OTP] subject tag fixed 
- [MISP foo] to [foo MISP] to be aligned with other e-mails
 2021-11-10 11:21:07 +01:00
Luciano Righetti 923c2e7741 chg: remove monitor stuff from docbloc 2021-11-10 10:39:44 +01:00
Luciano Righetti fb7e7212ef chg: remove workers monitor script, rely on Supervisor API for all worker-related stuff 2021-11-10 10:36:11 +01:00
Jakub Onderka d8e6422a8d new: [CLI] Redis memory usage diagnostics 2021-11-10 10:32:10 +01:00
Luciano Righetti 69a69e6e10 chg: try to get user via posix method first 2021-11-10 08:37:06 +01:00
Luciano Righetti 30bb52d705 chg: remove sleep from worker poll 2021-11-10 08:27:31 +01:00
iglocska 083a0a6550
Merge branch '2.4' into develop 2021-11-09 15:40:29 +01:00
Luciano Righetti 9f65954499 fix: class not found issue 2021-11-09 14:38:48 +01:00
Luciano Righetti 9e23a2744f chg: merge develop, fix conflicts 2021-11-09 14:23:51 +01:00
Luciano Righetti 2146cd49f7 chg: add background jobs settings to the ui editor 2021-11-09 14:19:07 +01:00
Luciano Righetti 3244f984b5 chg: add fxmlrpc package as suggested 2021-11-09 14:11:35 +01:00
Steve Clement 7283c8183a
chg: [installer] Bump to latest version 2021-11-09 12:09:01 +01:00
Steve Clement e61fc852ab
chg: [installer] Bump installer to latest version 2021-11-09 12:08:09 +01:00
Steve Clement 7929311d80
Merge branch '2.4' into develop 2021-11-09 12:07:23 +01:00
Steve Clement 87b671c5e5
Merge pull request #7944 from SteveClement/guides 
fix: [doc] Added missing misp-stix to the documentation
 2021-11-09 20:06:39 +09:00
Steve Clement 50009b6c8b
fix: [doc] Added missing misp-stix to the documentation 2021-11-09 12:05:16 +01:00
iglocska efab3931cd
fix: [schema] updated 2021-11-09 10:41:36 +01:00
Christophe Vandeplas 81252c560b
chg: [doc] updated dates in copyright section 2021-11-09 10:03:42 +01:00
Luciano Righetti edd27440ac fix: bad merge 2021-11-09 09:44:52 +01:00
Luciano Righetti 121bc48bad chg: minor refactor 2021-11-09 09:20:54 +01:00
Luciano Righetti e5e6d90f90 fix: minor cs issues 2021-11-09 09:16:37 +01:00
Luciano Righetti accc6bb9b4 chg: reload conf 2021-11-09 09:13:25 +01:00
Luciano Righetti 55e9238b46 chg: add redis namespace globally, add auto json de/serializer setting to redis client 2021-11-09 09:12:39 +01:00
Luciano Righetti 4218787934 chg: move initTool() logic to constructor 2021-11-09 08:43:39 +01:00
Jakub Onderka 5c5f2b54ca
Merge pull request #7938 from JakubOnderka/authkeys-encrypted-vol2 
Authkeys encrypted vol2
 2021-11-09 08:36:44 +01:00
Luciano Righetti 99b3f9da65 fix: revert bad merge 2021-11-09 08:24:51 +01:00
Luciano Righetti 755ed7a3f5 fix: fix typo 2021-11-08 14:43:26 +01:00
Luciano Righetti 96a46b6899 chg: merge develop, fix conflicts. 2021-11-08 14:37:27 +01:00
Luciano Righetti 01ef5eb186 fix: replace splat operator, follow cake 2.x private methods naming 2021-11-08 14:30:16 +01:00
iglocska dc925a321f
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-11-08 14:17:01 +01:00
iglocska 952a98dba8
Merge branch 'local_only' into develop 2021-11-08 14:15:18 +01:00
Luciano Righetti 0cc4904000 fix: change expected db version 2021-11-08 11:53:37 +01:00
Luciano Righetti f2c9d12eae chg: merge develop, fix conflicts. 2021-11-08 11:35:20 +01:00
Jakub Onderka cfc2696e4d
Merge pull request #7937 from JakubOnderka/app-controller-cleanup-vol4 
App controller cleanup vol4
 2021-11-07 18:04:01 +01:00
Jakub Onderka 012b8c4b21 new: [CLI] admin reencrypt command 2021-11-07 17:51:04 +01:00
Jakub Onderka 5569d7d2bf new: [security] Store authkeys for servers encrypted 2021-11-07 17:51:04 +01:00
Alexandre Dulaunoy 9ccc98e6ac
Merge pull request #7817 from fandigunawan/supports-minio 
new: Supports MinIO as alternative to AWS S3
 2021-11-07 17:45:09 +01:00
Jakub Onderka df5ab6a144 chg: [internal] Code style 2021-11-07 14:51:42 +01:00
Jakub Onderka c8738c2be4 fix: [internal] Remove unused helper 2021-11-07 14:51:26 +01:00
Jakub Onderka af234a006c chg: [internal] AppController cleanup 2021-11-07 14:38:39 +01:00
Fandi Gunawan 1166aa6d49 Adds default TLS validation to true and supports custom CA path 2021-11-07 18:48:14 +07:00
Jakub Onderka d355f0f6d5
Merge pull request #7936 from JakubOnderka/app-model-cleanup 
chg: [internal] App model cleanup
 2021-11-07 12:03:24 +01:00
Jakub Onderka 3459a09943 chg: [internal] App model cleanup 2021-11-07 10:40:01 +01:00
Jakub Onderka fdf75289f7
Merge pull request #7932 from JakubOnderka/pulling-simplify 
chg: [internal] Simplify code for pulling events
 2021-11-07 10:00:56 +01:00
Jakub Onderka 3baa6a120f
Merge pull request #7935 from JakubOnderka/system-setting-security 
chg: [internal] Make system setting more secure
 2021-11-07 09:56:21 +01:00
Jakub Onderka e844f35847 chg: [internal] Delete system setting when value is empty 2021-11-06 22:17:06 +01:00
Jakub Onderka 0198c7b0db chg: [internal] Make system setting more secure 2021-11-06 21:23:22 +01:00
Jakub Onderka fc6e150ace
Merge pull request #7742 from JakubOnderka/get-uuids-deprecate 
chg: [internal] Deprecate Org::getUUIDs endpoint
 2021-11-06 20:54:59 +01:00
Jakub Onderka 8794cfc9c5
Merge pull request #7934 from JakubOnderka/attribute-pagination 
Attribute pagination
 2021-11-06 20:53:51 +01:00