MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,331 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

19331 Commits (f05a3c832b291c0dbd4b955d3e9d70c39e868157)

Author SHA1 Message Date
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
mokaddem f50be529da
fix: [elements:serverRuleElementPush] Recover freetext tags not known by the instance 2021-04-28 11:29:45 +02:00
mokaddem b7d9ca5787
chg: [elements:rules_widget] Added collapsible for freetext inputs 2021-04-28 11:16:38 +02:00
mokaddem 3e2bc0d716
Merge remote-tracking branch 'origin/2.4' into develop 2021-04-28 09:53:50 +02:00
mokaddem 33ba8dd113
fix: [decayings:add] Correct usage of the translation function 2021-04-28 09:52:49 +02:00
mokaddem bacf072c59
chg: [users:index] Migrated view to factory 2021-04-28 09:14:54 +02:00
iglocska d2b1628f91
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-28 00:40:54 +02:00
iglocska d8749c95f7
Merge branch '2.4' into develop 2021-04-28 00:40:42 +02:00
iglocska 0e10b2780f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-28 00:40:26 +02:00
iglocska c0a1514814
new: [Correlation exclusions] clean function reworked 
- does everything on DB side
- no more issues with large lists being passed around
- should also be a fair bit faster
 2021-04-28 00:39:30 +02:00
Alexandre Dulaunoy e24a1f6fdd
Merge pull request #7374 from lfortemps/patch-3 
fix: [UI] Correctly display last login time
 2021-04-27 22:35:22 +02:00
User 283b899244 Added support for raspberry pi 2021-04-27 19:41:06 +02:00
mokaddem b65bd555a5 fix: [galaxyCluster:export] Only unset fields if they exists 
In some cases, galaxy clusters might not have targeting clusters
 2021-04-27 16:51:37 +02:00
mokaddem 5a7a108fe9 fix: [galaxyCluster:export] Only unset fields if they exists 
In some cases, galaxy clusters might not have targeting clusters
 2021-04-27 16:49:52 +02:00
Loïc Fortemps 5eb67f0fd9
fix: [UI] Correctly display last login time 
Until now, we were showing the "one before last" login time, this fixes the issue
 2021-04-27 15:42:01 +02:00
mokaddem a6f770f0a2
chg: [organisations:edit] Usage of the add view 2021-04-27 14:26:58 +02:00
mokaddem 6ec20b80d3
chg: [organisations:add] Migrated view to factory 2021-04-27 13:56:29 +02:00
mokaddem bc971658ba
new: [elements:genericForm] Added support of field descriptions 2021-04-27 12:12:39 +02:00
iglocska b88850bf6e
Merge branch '2.4' into develop 2021-04-27 12:11:40 +02:00
iglocska e1b9a612f7
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-27 12:11:26 +02:00
iglocska 7b19255ede
chg: [ACL] added correlation exception edit 2021-04-27 12:11:02 +02:00
Alexandre Dulaunoy 4e04e591be
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-27 11:23:31 +02:00
iglocska 01542e040b
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-27 10:54:04 +02:00
iglocska 9a9ef7d93d
Merge branch '2.4' into develop 2021-04-27 10:53:55 +02:00
iglocska b14b85a781
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-27 10:53:41 +02:00
iglocska d61ebc9905
new: [correlation exclusions] now have an optional comment field 
- explain why you exclude a value for easier maintenance
- edit existing exclusions to add those comments after the fact
 2021-04-27 10:52:53 +02:00
mokaddem cb00fc0222
new: [elements:indexCountry] Added country element to display flags and nationalities 2021-04-27 10:44:36 +02:00
mokaddem 77e68c5a07
chg: [organisations:index] Migrated view to factory 2021-04-27 10:44:09 +02:00
mokaddem 17bd316b35
chg: [elements:indexGenericField] Allow passing implode's glue 2021-04-27 10:43:38 +02:00
mokaddem 43b0f8d9b6 chg: [elements:indexPostlink] Added possibility to add confirm messages 
Fixed JS error throwing undefined variable in top correlations
 2021-04-27 10:29:31 +02:00
mokaddem ef4020d780 chg: [elements:indexPostlink] Added possibility to add confirm messages 
Fixed JS error throwing undefined variable in top correlations
 2021-04-27 10:25:11 +02:00
iglocska 72e3743899
Merge branch '2.4' into develop 2021-04-27 09:47:19 +02:00
iglocska 94afe67d68
new: [top correlations] Redirect to the attribute search when clicking a value 2021-04-27 09:46:26 +02:00
iglocska 22f391e6b2
new: [Index builder] add simple postlink field 2021-04-27 09:46:03 +02:00
iglocska 0dea395298
fix: [attribute search] Don't use form tampering protection for searches 2021-04-27 09:45:11 +02:00
iglocska a0b1d0964e
chg: [correlations] reverted the division by 2 for the correlation counts 
- there are legitimate cases where we get one way correlations
  - we use the value field to aggregate the count, which leads to it being incorrect when using advanced correlations (the reverse correlation will use the value of the remote side)
 2021-04-27 08:41:41 +02:00
Alexandre Dulaunoy a9ea6cfabf
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-04-27 06:16:50 +02:00
Alexandre Dulaunoy 8dd11807be
chg: [misp-objects] updated to the latest version 2021-04-27 06:16:29 +02:00
iglocska 122faf61dc
Merge branch '2.4' into develop 2021-04-27 00:46:45 +02:00