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

21807 Commits (a11c8172483d415dc45f622a2a48f7d1920175ef)

Author SHA1 Message Date
iglocska a144582b46
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2022-03-28 17:49:09 +02:00
iglocska 5052d471e1
fix: [authkeys] adding authkeys by org admins fixed 2022-03-28 17:48:36 +02:00
Jakub Onderka 888dac40aa
Merge pull request #8246 from JakubOnderka/ui-update 
UI update
 2022-03-28 13:06:12 +02:00
Jakub Onderka cebcd227df fix: [UI] Remove unused method submitQuickTag 2022-03-28 12:49:54 +02:00
Jakub Onderka 3adc05a01c fix: [UI] Avoid calling submitMassTaxonomyTag() JS method 2022-03-28 12:47:49 +02:00
Jakub Onderka e385e71551 fix: [UI] Avoid calling submitPublish() JS method 2022-03-28 12:44:56 +02:00
Jakub Onderka 86cfcefb10 fix: [UI] Normalize publish popup 2022-03-28 12:10:34 +02:00
Jakub Onderka f636c4e94d fix: [UI] Add missing onclick prevent default 2022-03-28 12:05:45 +02:00
Jakub Onderka 9140ece0d1 chg: [UI] Cleanup code for event confirmation dialog 2022-03-28 12:00:34 +02:00
Jakub Onderka ac4b195088 chg: [UI] Normalize delete event popup 2022-03-27 22:07:36 +02:00
Jakub Onderka 0feeefdc20 chg: [UI] Remove three inline onclick from code 2022-03-27 21:49:56 +02:00
Jakub Onderka 990fc20782 chg: [ui] Remove useless spaces from HTML code 2022-03-27 21:49:16 +02:00
Jakub Onderka 8f5ed8891e chg: [ui] Remove two inline onclick 2022-03-27 21:47:46 +02:00
Jakub Onderka dc80aaabbb
Merge pull request #8245 from JakubOnderka/advaced_authkeys_non_exists_user 
new: [test] advanced_authkeys_non_exists_user
 2022-03-27 19:23:30 +02:00
Jakub Onderka 5167e4090f chg: [galaxy] Simplify code for fetching galaxy cluster 2022-03-27 19:15:10 +02:00
Jakub Onderka 5826585454 chg: [test] Try to use virtualenv from system packages 2022-03-27 18:53:50 +02:00
Jakub Onderka 4af34a999c chg [galaxy] Simplify saving galaxies 2022-03-27 18:45:32 +02:00
Jakub Onderka 67fd15f543 chg: [warninglist] Insert in bigger chunks 2022-03-27 18:45:32 +02:00
Jakub Onderka 8639c7436e chg: [test] Do not install useless system packages 2022-03-27 18:45:32 +02:00
Jakub Onderka 1a589c64f8 chg [authkeys] Add validation 2022-03-27 18:45:32 +02:00
Jakub Onderka cba6e6dc8c chg: [test] Try to avoid installing poetry 2022-03-27 18:45:32 +02:00
Jakub Onderka 72099918d5 new: [test] advanced_authkeys_non_exists_user 2022-03-27 18:45:31 +02:00
Jakub Onderka 6ea8214899
Merge pull request #8244 from JakubOnderka/syslog-changes 
chg: [syslog] Remove duplicate date and log type from log
 2022-03-27 13:26:13 +02:00
Jakub Onderka 8636c1f903 chg: [syslog] Remove duplicate date and log type from log 2022-03-27 13:05:33 +02:00
Jakub Onderka 4ff7cccc7a
Merge pull request #8229 from JakubOnderka/sign-fix 
chg: [sign] Simplified key handling
 2022-03-27 10:47:16 +02:00
Jakub Onderka e6202e8078 fixup! new: [test] JSONConverterToolTest 2022-03-26 13:57:24 +01:00
Jakub Onderka bfb9e98c56 fixup! fix: [sign] Allow to sign event by key stored in gpg homedir 2022-03-26 13:38:38 +01:00
Jakub Onderka 5b65286f51 new: [test] JSONConverterToolTest 2022-03-26 13:17:19 +01:00
Jakub Onderka 6af7503b36 fix: [sign] Remove unused method 2022-03-26 13:16:51 +01:00
Jakub Onderka a07625294b chg: [sign] Return signature in binary format 2022-03-26 12:10:26 +01:00
Jakub Onderka edbf26d9b2 fix: [internal] Simplify RestResponse code 2022-03-26 12:10:26 +01:00
Jakub Onderka f1dd24933c fix: [sign] Allow to sign event by key stored in gpg homedir 2022-03-26 12:10:26 +01:00
Jakub Onderka cc3b7271d9 fix: [api] EventsController::toggleProtect 2022-03-26 12:10:26 +01:00
Jakub Onderka b21ad57b47 new: [test] GpgToolTest 2022-03-26 12:10:26 +01:00
Jakub Onderka 6e75c3b560 chg: [gpgTool] Simplify code 2022-03-26 08:41:11 +01:00
Jakub Onderka 5253ada680 chg: [sign] Simplified key handling 2022-03-26 08:41:09 +01:00
Luciano Righetti 34df13af81 fix: typo 2022-03-25 16:32:32 +01:00
iglocska 6e6d918add
Merge branch '2.4' into develop 2022-03-25 08:53:39 +01:00
iglocska f4e390ae27
new: [event locks] have an option to disable them 
- it's annoying and causes headaches
- as discussed in #8204
 2022-03-25 08:52:51 +01:00
iglocska d1e661ffe0
Merge branch 'develop' into 2.4 2022-03-24 23:19:01 +01:00
iglocska 123d484be7
chg: [VERSION] bump 2022-03-24 23:18:25 +01:00
iglocska aeb927fa29
Merge branch '2.4' into develop 2022-03-24 23:17:54 +01:00
iglocska 94c8d69577
fix: [notice error] in the event view fixed 2022-03-24 23:14:58 +01:00
iglocska e987019748
fix: [authkeys] tighter controls over adding authkeys 
- only allow to add authkeys to your own user and any user in your own organisation that is not org admin / site admin
- correctly filter the authkey add dialogue for the requested user if going through a user profile

- as reported by @oivindoh
 2022-03-24 23:12:41 +01:00
iglocska 87a9d8b960
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2022-03-24 16:12:57 +01:00
iglocska 6cc19478d4
chg: [server sync] update to the previous fix to include the recursive condition 
- instead of just replacing the condition with the contain list, include both to get the performance gains back
 2022-03-24 16:12:46 +01:00
iglocska a27ae0eeb9
Merge branch 'develop' of github.com:MISP/MISP into develop 2022-03-24 16:12:32 +01:00
iglocska 08ccdf23e2
chg: [server sync] update to the previous fix to include the recursive condition 
- instead of just replacing the condition with the contain list, include both to get the performance gains back
 2022-03-24 16:11:29 +01:00
Raphaël Vinot 5ae4024a09 chg: [PyMISP] Bump version 2022-03-24 15:51:52 +01:00
Alexandre Dulaunoy 1098da8f3b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2022-03-24 15:44:05 +01:00