MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,751 Commits
33 Branches
364 Tags
185 MiB
Commit Graph

19751 Commits (7ac9cae7b6aa21eb7a8c4d492dc0e507ab4cb14a)

Author SHA1 Message Date
Jakub Onderka 7ac9cae7b6
Merge pull request #7539 from JakubOnderka/publishing-refactoring 
Refactor publishing event
 2021-07-27 20:52:17 +02:00
Jakub Onderka c6183dbb98
Merge pull request #7609 from JakubOnderka/code-cleanup-vol6 
Code cleanup vol6
 2021-07-27 19:11:28 +02:00
Jakub Onderka 180fb627cc chg: [internal] Convert array to const 2021-07-27 18:58:04 +02:00
Jakub Onderka db242d6901 chg: [internal] Convert array to const 2021-07-27 18:49:40 +02:00
Jakub Onderka bcb9328841 chg: [internal] Simplified Attribute::deleteAttribute method 2021-07-27 18:43:27 +02:00
Jakub Onderka 15e3cc799c chg: [internal] Removed unused variables 2021-07-27 18:43:16 +02:00
Jakub Onderka 974c28d8a7 chg: [internal] Remove unused variable 2021-07-27 18:42:47 +02:00
Jakub Onderka 442392652f
Merge pull request #7607 from JakubOnderka/non-correlationg-types-const 
chg: [internal] Convert array to const
 2021-07-27 18:40:47 +02:00
Jakub Onderka d4c2d10fe3 chg: [internal] Convert array to const 2021-07-27 16:43:27 +02:00
iglocska 98e1f3f2f9
fix: [compatibility] several scoped constants reverted 2021-07-27 16:16:52 +02:00
iglocska 3295f69de5
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-27 16:06:07 +02:00
iglocska 8a2cd19491
chg: [compatibility] scoped constant changed to unscoped to allow for 7.0 compatibility 
- update your PHP version though
 2021-07-27 16:05:13 +02:00
Liviu Valsan 4b74a0d342
chg: [shibbauth] added option to block organisation changes at login 
- New ApacheShibbAuth.BlockOrgModifications setting added, defaults to false, boolean. If set to true, will block updates to the organisation of existing users on authentication. This preserves any modifications made by a site admin in MISP and is similar to ApacheShibbauth.BlockRoleModifications (same logic applied to role modifications).
 2021-07-27 15:27:48 +02:00
iglocska e45245ec86
fix: [proposal alert email] function call fixed 2021-07-27 15:09:23 +02:00
iglocska 3166ef66a2
chg: [version] bump 2021-07-27 14:07:35 +02:00
iglocska 2a2303f36d
chg: [PyMISP] bump 2021-07-27 13:47:50 +02:00
Jakub Onderka babd5717d3
Merge pull request #7603 from JakubOnderka/fix-tests-vol2 
Fix tests vol2
 2021-07-27 13:07:47 +02:00
iglocska 251ba2ef11
chg: [PyMISP] bump 2021-07-27 11:53:13 +02:00
Jakub Onderka cf93bbb20e chg: [security audit] Check config.php.bk file permission 2021-07-27 10:59:07 +02:00
Jakub Onderka fa62d06c03 chg: [internal] Create config backup just when it is necessary 2021-07-27 10:29:16 +02:00
Jakub Onderka 91ba045db6 chg: [internal] Reset PHP cache after config file is successfully changed 2021-07-27 10:29:16 +02:00
Jakub Onderka 4ee2726f37 chg: [test] Move PHP tests to different task 2021-07-27 10:29:16 +02:00
Jakub Onderka 9a5b40f240 fix: [test] Set expected config for security tests 2021-07-26 16:55:48 +02:00
Jakub Onderka 0fa5551d93 fix: [test] Check if user is logged 2021-07-26 16:54:46 +02:00
iglocska b5feead107
chg: [PyMISP] bump 2021-07-26 16:47:26 +02:00
iglocska 4bb08fe151
fix: [config defaults] unset the default python bin path 2021-07-26 16:18:11 +02:00
iglocska 76af4b9d90
fix: [config defaults] changed default attachment storage 2021-07-26 16:16:23 +02:00
iglocska c8d34cc0f5
fix: [Userinit] create advanced auth key when needed 2021-07-26 16:12:04 +02:00
Jakub Onderka c9d60601e0
Merge pull request #7596 from JakubOnderka/publishd-time 
chg: [UI] Use time element for event published timestamp
 2021-07-26 14:18:16 +02:00
Jakub Onderka 1ace900043
Merge pull request #7589 from JakubOnderka/org-ui 
Org UI
 2021-07-26 14:17:37 +02:00
iglocska 1cb1cc546e
chg: [republish ban] enabled by default on new installs 2021-07-26 13:44:38 +02:00
iglocska 875811975d
Merge branch 'config_defaults' into develop 2021-07-26 13:43:38 +02:00
Jakub Onderka 4f28cf257b chg: [UI] Raise font size of local org description 2021-07-26 13:35:33 +02:00
Jakub Onderka e7565b5cb9 chg: [UI] After creating new org, redirect to org details 2021-07-26 13:35:33 +02:00
Jakub Onderka 7a379345f6 chg: [UI] Add link to add new organisation 2021-07-26 13:35:32 +02:00
Jakub Onderka 9f773d7134
Merge pull request #7600 from JakubOnderka/fix-tests 
fix: [test] After CLI setSetting change
 2021-07-26 13:22:28 +02:00
Jakub Onderka 0e5fa3ed8e fix: [test] Redis password can be empty 2021-07-26 12:38:44 +02:00
Jakub Onderka 5c56518aaf fix: [test] After CLI setSetting change 2021-07-26 12:37:17 +02:00
mokaddem b9d8b9518c
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-26 12:29:47 +02:00
mokaddem 78edbbca64
fix: [security] Stored XSS when forking a galaxy cluster 
As reported by Giuseppe Diego Gianni
 2021-07-26 12:29:20 +02:00
iglocska 567bcdc1ca
chg: [CLI] better error messages when a setting change fails 
- explain why it failed
- explain how a user can override it
 2021-07-26 10:23:57 +02:00
Alexandre Dulaunoy 4455d1b1b4
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-07-25 09:15:28 +02:00
Alexandre Dulaunoy a2f18fd4ea
chg: [misp-objects] fix #7599 2021-07-25 09:12:47 +02:00
iglocska 12e75b1e04
Merge branch 'threads_refactor' into develop 2021-07-23 15:45:28 +02:00
iglocska eca577bc95
fix: [posts] add org field to email job 2021-07-23 15:44:53 +02:00
iglocska b5d66bb66e
Merge branch 'blocklist_refactor' into develop 2021-07-23 11:43:35 +02:00
iglocska 26f9974865
Merge branch 'template_refactor' into develop 2021-07-23 11:30:11 +02:00
Jakub Onderka 7a70bc55bb chg: [UI] Use time element for event published timestamp 2021-07-22 16:21:48 +02:00
Luciano Righetti c6c1ef4b88 fix: remove old copy 2021-07-22 15:56:09 +02:00
Jakub Onderka fe548afdea
Merge pull request #7595 from JakubOnderka/code-cleanup-vol4 
Code cleanup vol4
 2021-07-22 14:03:19 +02:00