MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
21,137 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

21137 Commits (48e13a9ee7f9dd497d5649297879f49f30613d62)

Author SHA1 Message Date
chrisr3d 64a30723b7
fix: [stix export] Copy paste issue from merge conflict handling 2021-12-13 16:59:14 +01:00
chrisr3d a8a51ff780
fix: [stix1 export] Syntax typo from merge conflict handling 2021-12-13 16:58:05 +01:00
Sami Mokaddem f8d2782fb9
fix: [server:edit] Extra field in group by leading to object duplication 2021-12-13 08:10:03 +01:00
chrisr3d fadfd10835
Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-12-13 04:11:47 +01:00
Sami Mokaddem 666ffcbe25
fix: [server:edit] Typo synchronisation 2021-12-10 15:34:17 +01:00
Sami Mokaddem 0bb4f372ff
fix: [server:pull] Typo while unsetting attribute blocked by filtering rule 2021-12-10 13:47:39 +01:00
Sami Mokaddem fee5563c5a
chg: [server:pull] Do not log empty event entries if it was cause by the rules 2021-12-10 10:56:45 +01:00
Sami Mokaddem 6479f841a1
chg: [servers:index] Improved UI 
Only show blocked attribute types/objects if setting is turned on
 2021-12-10 10:07:37 +01:00
Sami Mokaddem 7d87fef8ea
fix: [events:synchronisation] debug and typos 2021-12-10 10:02:49 +01:00
Sami Mokaddem 3db4a4636b
chg: [server:synchronisation] Usage of template_uuid instead of the object name 2021-12-10 09:52:07 +01:00
Sami Mokaddem 9d104e941e
chg: [server:synchronisation] Tpye filtering duringg PUSH synchronisation 
Split type on attributes and objects
 2021-12-10 09:32:49 +01:00
Sami Mokaddem 4848d1013a
fix: [servers:edit] Capture filtering freetext tags for PUSH 2021-12-10 09:31:33 +01:00
chrisr3d 8af7a00073
chg: [stix export] Merging all the differents changes at different places to support every type of collection export as STIX 1 & 2 2021-12-09 16:52:50 +01:00
chrisr3d db44f1a105
fix: [stix1 export] Removed debugging print 2021-12-09 16:36:24 +01:00
Sami Mokaddem 014ae34c53
new: [server:synchronisation] Type filtering during PULL synchronisation 
Warning: This feature can introduce unwanted behaviours and inconsistencies
 2021-12-09 12:29:03 +01:00
chrisr3d f370fba3a7
chg: [stix1 export] Better parsing with a separation between events and attributes collections export 2021-12-09 10:52:39 +01:00
chrisr3d a68a455545
fix: [stix2 export] Added the required traceback parameter to the `print_tb` call 2021-12-09 10:43:50 +01:00
Sami Mokaddem 8cf2914142
new: [event-timeline] Support of image attachments 2021-12-08 12:14:13 +01:00
Luciano Righetti 1fcb393b32 fix: do not try to autocomplete with users authkey 2021-12-08 09:01:00 +01:00
iglocska 3593e34939
Merge branch '2.4' into develop 2021-12-07 18:15:01 +01:00
iglocska a546fc7919
fix: [API] downloadAttachment API user object fetching fixed 
- user is already in session, just reuse it
 2021-12-07 18:14:12 +01:00
Luciano Righetti 79b8fb667b
Merge pull request #8019 from righel/add_events_time_filter 
new: add events index time ui filters
 2021-12-07 09:11:24 +01:00
Luciano Righetti b2230ca46a fix: publishtimestamp defaults 2021-12-07 08:57:34 +01:00
Luciano Righetti 643e60087d fix: array to string notice 2021-12-07 08:41:55 +01:00
Luciano Righetti ed85319d7b fix: typos, bump js version 2021-12-06 16:20:51 +01:00
Luciano Righetti e6f92911a2 fix: datetime format 2021-12-06 16:12:04 +01:00
Luciano Righetti 438ecfc29b fix: revert change 2021-12-06 16:10:16 +01:00
Luciano Righetti 869ef3e874 fix: use from/until input in UI filters 2021-12-06 16:01:12 +01:00
Luciano Righetti ba37a8240b fix: notice when filter is array 2021-12-06 14:43:27 +01:00
Luciano Righetti 08913a0a73 add: timestamp and publish_timestamp filters and optional columns to /events/index 2021-12-06 14:27:29 +01:00
iglocska 1a152b2d33
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-12-02 14:04:06 +01:00
iglocska 72548fd9a4
fix: [UI] Ajax forms lose persistence 
- generic Form builder now has the persistence baked in
- capture all form fields' data before submiting as expected
 2021-12-02 14:03:20 +01:00
Alexandre Dulaunoy 956760abe9
Merge pull request #7997 from righel/avoid-fatals-in-settings-diagnostics 
fix: show error message instead of fatal error when diagnostics tool …
 2021-12-01 13:14:17 +01:00
Alexandre Dulaunoy b869ff9154
Merge pull request #8008 from righel/add-issues-form-templates 
chg: use issue forms templates with required fields
 2021-12-01 10:42:27 +01:00
Luciano Righetti 514a640191 chg: add dicussions link 2021-12-01 10:41:05 +01:00
Luciano Righetti 514af2a872 chg: use issue forms templates with required fields 2021-12-01 10:13:59 +01:00
iglocska b6f9484ef8
Merge branch 'sg_feeds' into develop 2021-11-30 15:05:13 +01:00
iglocska 175a0b204f
fix: [feeds] i18n some strings 2021-11-30 15:04:48 +01:00
iglocska e905817768
fix: [feeds] preview attribute distribution 
- escape sharing group name
 2021-11-30 15:04:19 +01:00
Christophe Vandeplas 1f79573fd7 chg: [feeds] Support for sharing groups with feeds, fixes #5758 2021-11-30 12:55:08 +01:00
Alexandre Dulaunoy 38e0a1f6dc
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-11-29 12:16:37 +01:00
Alexandre Dulaunoy 8bfe850607
chg: [taxonomies] updated to the latest version 2021-11-29 12:16:06 +01:00
Jakub Onderka 3463c60606
Merge pull request #7996 from JakubOnderka/cli-authkey 
new: [CLI] Get authkey info by `cake user authkey`
 2021-11-26 14:47:08 +01:00
Luciano Righetti a4b1368038
Merge pull request #7967 from righel/toggle_correlation_mass_edit_attributes 
chg: allow change disable_correlation in mass edit attributes
 2021-11-26 11:47:33 +01:00
Luciano Righetti 019bba81af fix: show error message instead of fatal error when diagnostics tool fails to run 2021-11-26 11:45:10 +01:00
Luciano Righetti 49f938f731
Merge pull request #7994 from righel/fix-issue-7988 
fix: improve error handling when supervisor is not available or conne…
 2021-11-26 08:53:13 +01:00
Jakub Onderka 8d7df612f3 new: [CLI] Get authkey info by `cake user authkey` 2021-11-25 18:15:22 +01:00
Jakub Onderka 708bb6e3f7
Merge pull request #7995 from coolacid/WordWrap 
fix: Autocrypt email header force RFC 5322 - 2.1.1 line length limits
 2021-11-25 18:13:13 +01:00
Jason Kendall e0bea3119a RFC 5322 - 2.1.1 line length limits 
Use '\r\n' instead of PHP_EOL

Use '\r\n' instead of PHP_EOL
 2021-11-25 10:50:46 -05:00
Luciano Righetti 08c66ed165 fix: wrong params 2021-11-25 14:34:10 +01:00