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

1008 Commits (d67ac118a3adef937b171486c28dfa70fcfcee39)

Author SHA1 Message Date
Jakub Onderka d67ac118a3 chg: [internal] Code style 2021-11-05 09:19:57 +01:00
Jakub Onderka c9597ba3e9 new: Store system settings in database 2021-11-05 09:19:56 +01:00
Jakub Onderka 53b0da0aae
Merge pull request #7897 from JakubOnderka/preview-index-api 
Preview index api
 2021-10-29 12:50:36 +02:00
Jakub Onderka b715c48fd4 chg: [internal] Simplify code for Server::serverGetRequest 2021-10-28 21:57:05 +02:00
Jakub Onderka f6470e4326 fix: [internal] removeOrphanedCorrelations 2021-10-28 21:35:46 +02:00
Jakub Onderka 8b1def6b32 chg: [internal] Simplify code for compareDBIndexes 2021-10-20 17:34:55 +02:00
Sami Mokaddem a4d20632c9
chg: [Server:update] Execute git submodule sync before updating 
This is done in order to make sure the submodules' remote URL is inline with the value defined in the .gitmodules
 2021-10-19 14:09:53 +02:00
Jakub Onderka 5b298912d9
Merge pull request #7797 from JakubOnderka/server-pull-cleanup 
chg: [internal] Code cleanup for Server::pull method
 2021-10-16 19:20:46 +02:00
Jakub Onderka 86effcf41f
Merge pull request #7658 from JakubOnderka/compatiblity-check-log 
chg: [internal] Create log entry for compatibility check
 2021-10-16 09:29:01 +02:00
Jakub Onderka 459afd6f67 chg: [internal] Code cleanup for Server::pull method 2021-10-16 09:26:42 +02:00
Jakub Onderka 7fd45b4b11 chg: [internal] Add new submodules to diagnostics page 2021-10-11 11:52:42 +02:00
Jakub Onderka 622c56fc20
Merge pull request #7814 from JakubOnderka/server-save-setting 
fix: [internal] Server save setting file
 2021-10-08 15:46:12 +02:00
Jakub Onderka 96d2199726 fix: [internal] Server save setting file 2021-10-08 15:28:31 +02:00
iglocska 20c453d970
Merge branch 'misp-stix' into develop 2021-10-07 16:35:44 +02:00
chrisr3d a945f09401 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-06 17:54:55 +02:00
Sami Mokaddem 3822521d2c
chg: [users:routeafterlogin] Allow forcing the pre-login URL to be HTTPS 
This can be achieved by turning the setting MISP.forceHTTPSforPreLoginRequestedURL to true.
 2021-10-06 11:39:23 +02:00
Sami Mokaddem 4091849888
Merge branch 'feature-force-https-for-pre-login-request' into develop 2021-10-06 09:09:36 +02:00
Sami Mokaddem ec4074f925
chg: [users:routeafterlogin] Allow forcing the pre-login URL to be HTTPS 
This can be achieved by turning the setting MISP.forceHTTPSforPreLoginRequestedURL to true.
 2021-10-06 09:09:06 +02:00
Jakub Onderka 923f2501d3 fix: [internal] Bad merge 2021-10-05 19:41:57 +02:00
Sami Mokaddem 9a6d0b2b96
Merge remote-tracking branch 'origin/2.4' into develop 2021-10-05 16:15:44 +02:00
chrisr3d 9f4fe71a55 Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-10-04 13:45:46 +02:00
Jakub Onderka 1a44c3885d new: [internal] OrgBlocklist::removeBlockedEvents 2021-09-30 21:18:25 +02:00
Jakub Onderka c79db5cf0a
Merge pull request #7688 from JakubOnderka/server-sync-get-ids 
chg: [sync] Use server sync tool for fetching remote events index
 2021-09-30 19:46:26 +02:00
Jakub Onderka 48016120b7 chg: [internal] Use AdminSetting::getSetting method 2021-09-30 13:09:46 +02:00
Jakub Onderka 325a3d356a chg: [internal] Server::command_line_functions is generated on demand 2021-09-27 23:16:34 +02:00
Jakub Onderka d20b6ce7c3 chg: [internal] Do not try to save config when config file is not writeable 2021-09-27 14:10:47 +02:00
Andras Iklody 1eaf2f40c4
Merge pull request #7224 from mrihtar/cmdLineHelp 
fix: [shells] Fixed/improved command line help
 2021-09-24 00:15:42 +02:00
Jakub Onderka a539b2ee7c
Merge pull request #7579 from JakubOnderka/publish_alerts_summary_only_deprecate 
chg: [alert] Deprecate `MISP.publish_alerts_summary_only`
 2021-09-07 12:19:01 +02:00
chrisr3d 731f22a90d
fix: [diagnostic] Updated stix2 python library requirements 2021-09-01 15:41:37 +02:00
mokaddem 2153537e01
new: [event:notification] Added email notification ban system based on users triggering the notification 2021-08-31 09:39:05 +02:00
Jakub Onderka da1818c3cc fix: [internal] Fetching filter rules 2021-08-30 17:51:17 +02:00
Alexandre Dulaunoy 67556d86fe
Merge branch '2.4' into develop 2021-08-27 11:03:31 +02:00
chrisr3d 52cda9736c
chg: [diagnostic] Bumped updated STIX python libraries versions 
- Should fix diagnostic issues with version mentioned in #7054
 2021-08-25 14:57:51 +02:00
Jakub Onderka f7371ccda4 chg: [internal] Server controller cleanup 2021-08-25 10:29:45 +02:00
Jakub Onderka ea822b3070 chg: [sync] Use server sync tool for fetching remote events index 2021-08-24 10:50:51 +02:00
Jakub Onderka 0fc4698b60
Merge pull request #7634 from JakubOnderka/fix-sighting-push-vol2 
fix: [sync] Pushing sightings
 2021-08-24 09:55:51 +02:00
Jakub Onderka 0e9a5511a8
Merge pull request #7673 from JakubOnderka/sync-filter-ref 
chg: [sync] Use server sync to get available sync filtering rules
 2021-08-23 17:25:23 +02:00
Jakub Onderka 439ec5cceb fix: [internal] Code cleanup 2021-08-23 17:03:44 +02:00
Jakub Onderka 157dbed32b chg: [sync] Simplify server post test code 2021-08-21 11:29:14 +02:00
Jakub Onderka c04c009567
Merge pull request #7676 from JakubOnderka/connection-test-server-sync 
chg: [sync] Use server sync tool for connection test
 2021-08-21 11:03:04 +02:00
Jakub Onderka d1ff149df2 chg: [sync] Use server sync tool for connection test 2021-08-20 17:42:55 +02:00
Jakub Onderka df007b3788 chg: [sync] Use server sync to get available sync filtering rules 2021-08-20 15:34:43 +02:00
Jakub Onderka faf5054583
Merge pull request #7649 from JakubOnderka/pull-sightings 
chg: [sync] Pull just necessary data when pulling sightings
 2021-08-20 09:26:09 +02:00
Matjaz Rihtar eaae8c3ca7
fix: [shells] Sync improved cmd line help to 9d7da310 2021-08-16 21:56:04 +02:00
Jakub Onderka ad31e6f477 chg: [sync] Better exception handling 2021-08-13 10:35:30 +02:00
Jakub Onderka a5712b8edd chg: [sync] Use server sync tool for compatibility check 2021-08-13 10:32:38 +02:00
Jakub Onderka 2a587c158b chg: [internal] Create log entry for compatibility check 2021-08-13 10:18:49 +02:00
Jakub Onderka 97b16fe552 chg: [sync] Use sync tool for pulling proposals 2021-08-11 20:47:52 +02:00
Jakub Onderka 0174336156 chg: [sync] Pull just necessary data when pulling sightings 2021-08-11 18:42:22 +02:00
Jakub Onderka 9d0608bc6e chg: [sync] Pull events with less info 2021-08-11 13:31:56 +02:00