MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,425 Commits
34 Branches
365 Tags
188 MiB
Commit Graph

19425 Commits (5f5965394535dd47d601449f23888f83fd18712b)

Author SHA1 Message Date
Alexandre Dulaunoy 24185cdba3
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-05-01 11:08:27 +02:00
Alexandre Dulaunoy 8aaeaf2f4f
chg: [warning-lists] updated to the latest version 2021-05-01 11:07:58 +02:00
Jakub Onderka 2da03a7924
Merge pull request #7388 from JakubOnderka/fix-log-warning 
Fix log warning
 2021-04-30 16:16:53 +02:00
Jakub Onderka 122f9cddd7 fix: [UI] Warning message for event modification warning 2021-04-30 16:04:33 +02:00
mokaddem c9227bc8de
chg: [event:alert] Added option to refresh to ban 2021-04-30 15:01:06 +02:00
mokaddem 95ceeebebb
chg: [event:alert] Added option to refresh to ban 2021-04-30 15:00:08 +02:00
mokaddem 80a3fc3cd5
Merge branch 'feature-event-republishing-ban' into develop 2021-04-30 13:59:58 +02:00
mokaddem b71c73a304
chg: [event:getEventRepublishBanStatus] Improved wording 2021-04-30 13:59:15 +02:00
mokaddem 4c5daa55c5
fix: [server:settings] Typo 2021-04-30 13:59:02 +02:00
mokaddem eac4918ab6
new: [event:alert] Re-publishing ban feature based on configurable threshold 2021-04-30 13:58:53 +02:00
mokaddem 4da31ca399
Merge remote-tracking branch 'origin/2.4' into feature-event-republishing-ban 2021-04-30 13:56:51 +02:00
Jakub Onderka 4bc9c80efd fix: [db_schema] Update to version 68 2021-04-30 12:34:21 +02:00
mokaddem 80792c0a15
chg: [event:getEventRepublishBanStatus] Improved wording 2021-04-30 10:19:47 +02:00
mokaddem 132f4850ca
fix: [server:settings] Typo 2021-04-30 10:12:42 +02:00
mokaddem 475cd2563d
new: [event:alert] Re-publishing ban feature based on configurable threshold 2021-04-30 10:06:49 +02:00
mokaddem aaae08cab4
chg: [warninglists:index] Moved views to factory - WiP 2021-04-30 08:35:17 +02:00
Alexandre Dulaunoy 361e5bee25
chg: [misp-galaxy] updated to the latest version 2021-04-29 23:30:47 +02:00
chrisr3d 34af811565 Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-29 20:07:47 +02:00
chrisr3d 32849b1087
fix: [stix2 export] Making sure timestamps are always converted into the format STIX likes 2021-04-29 20:05:38 +02:00
chrisr3d 47b820e9f2 Merge branch '2.4' of https://github.com/MISP/MISP into develop 2021-04-29 18:29:38 +02:00
chrisr3d 3653e62fd8
fix: [stix2 export] Making sure attributes have their Galaxy field before trying to parse it 2021-04-29 18:19:05 +02:00
mokaddem da8adac370
chg: [allowedlist] Migrated views to factory 2021-04-29 15:42:05 +02:00
chrisr3d dc93212ec5 Merge branch '2.4' of https://github.com/MISP/MISP into develop 2021-04-29 14:38:49 +02:00
chrisr3d 6fd40b10ae Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-29 14:37:26 +02:00
chrisr3d 0ced4cb4aa
fix: [stix1 import] Avoiding AttributeError exceptions when the STIX packages have no header 2021-04-29 14:09:08 +02:00
mokaddem 2c2aac4862
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-29 13:32:11 +02:00
mokaddem f894109b26
fix: [files:defaut_feeds] Added trailing slash 
Fix #7022
 2021-04-29 13:29:59 +02:00
Jakub Onderka da166c878a
Merge pull request #7384 from JakubOnderka/fix-db-schema 
fix: [db_schema] Update to version 68
 2021-04-29 12:28:57 +02:00
Raphaël Vinot 98d4316176
Update supportFunctions.md 
pull from oirigin main and not origin master in PyMISP
 2021-04-29 12:22:30 +02:00
Jakub Onderka 178d10b709 fix: [db_schema] Update to version 68 2021-04-29 12:18:48 +02:00
Jakub Onderka c5375c2e53
Merge pull request #7367 from JakubOnderka/proposal-index-ui 
chg: [UI] Link to proposal limited view from proposal event index
 2021-04-29 12:05:22 +02:00
chrisr3d 74a4011908 Merge branch '2.4' of github.com:MISP/MISP into develop 2021-04-28 18:41:53 +02:00
chrisr3d a57784fb05
fix: [stix2 export] Copy paste issue 2021-04-28 18:36:39 +02:00
chrisr3d e9bfd34d89 Merge branch '2.4' of github.com:MISP/MISP into develop 2021-04-28 18:34:06 +02:00
chrisr3d f098dba5d7
fix: [stix2 export] Trying to make first_seen & last_seen fields are exported in an iso-formatted datetime format 2021-04-28 18:32:30 +02:00
chrisr3d 32d107468e
fix: [stix2 export] Avoiding issues with MISP events 'Event' field 2021-04-28 18:31:49 +02:00
chrisr3d 7893d96db9 Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-28 15:56:43 +02:00
chrisr3d 7d4abe0042 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-28 15:55:15 +02:00
chrisr3d 8e7a55d0b2
fix: [stix2 import] Added the missing ip address observable parsing function 
- Should fix #6855
 2021-04-28 15:54:07 +02:00
chrisr3d 82243d5eab
fix: [stix2 import] Avoid missing the to_ids flag when set to False 
- attribute.get('to_ids') with 'to_ids' set to
  False will simply skip the field, and let then
  MISP set the flag to the default 'to_ids' value
  depending on the attribute type
- With the test being `attribute.get('to_ids') is not None`
  we make sure even if 'to_ids' is False, we get
  the field as it is
 2021-04-28 15:51:00 +02:00
iglocska ad37454e89
Merge branch '2.4' into develop 2021-04-28 15:34:49 +02:00
iglocska ecd09dfec2
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-28 15:34:17 +02:00
iglocska ef9370514f
fix: [emailing] password resets and OTP didn't handle line breaks correctly 2021-04-28 15:33:50 +02:00
mokaddem b647c3e6c2
Merge branch 'improvements-sync-filter-rules2' into develop 2021-04-28 15:24:16 +02:00
mokaddem 0662ac710e
chg: [elements:serverRuleElements] Removed useless spaces 2021-04-28 15:23:47 +02:00
mokaddem 5cdba48eef
chg: [server:queryAvailableSyncFilteringRules] Returns error message instead of throwing error 2021-04-28 15:14:28 +02:00
mokaddem 960d46ec8a
chg: [servers:edit] Added indicative text for serverRuleElements 2021-04-28 14:58:31 +02:00
mokaddem bff20114d7
chg: [elements:serverRuleServers] Added text for each scopes 2021-04-28 14:57:58 +02:00
mokaddem 428d3875e0
chg: [elements:serverRuleElements] Reset widgets state on modal close 2021-04-28 14:42:04 +02:00
Alexandre Dulaunoy 1814195f79
chg: [objects] updated to the latest version 2021-04-28 14:08:09 +02:00