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

21008 Commits (880709b91bddda5d0e5f2ffc198db0264b46e2ea)

Author SHA1 Message Date
Alexandre Dulaunoy 880709b91b
Merge branch '2.4' of github.com:MISP/MISP into develop 2021-12-17 15:41:35 +01:00
Alexandre Dulaunoy 1444724dfb
chg: [warninglists] updated 2021-12-17 15:39:30 +01:00
Alexandre Dulaunoy 6246fcd945
chg: [pip] unused and broken Pipfile.lock (old conflict merged) 2021-12-17 11:42:49 +01:00
Alexandre Dulaunoy 6af6a4ea1a
chg: [pip] unused and broken Pipfile.lock (old conflict merged) 2021-12-17 11:41:00 +01:00
Sami Mokaddem 5cdc0cc7a7
chg: [app] Bumped query version 2021-12-17 11:38:34 +01:00
Sami Mokaddem 042e1b296a
fix: [tools:timeline] Usage of correct UUID and disabled polling extrapolation 
This half baked feature was making thing confusing for the users. If we ever need it implemented it should be something more robust and configurable.
 2021-12-17 11:36:41 +01:00
Sami Mokaddem 934f94ee90
chg: [event:timeline] Fit timeline after initial load 2021-12-17 11:34:51 +01:00
Steve Clement f132a6b497
Merge branch '2.4' into develop 2021-12-17 11:07:52 +04:00
Steve Clement 559d879c14
chg: [installer] Update to latest version 2021-12-17 11:06:55 +04:00
Steve Clement 28259ac3ef
Merge pull request #8035 from SteveClement/guides 2021-12-17 11:05:43 +04:00
Steve Clement 5561053e25
chg: [doc] endpoint.com is now enpointdev.com 2021-12-17 10:59:08 +04: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
Jakub Onderka e6e716971a
Merge pull request #7993 from JakubOnderka/fix-7961 
fix: [internal] Fixes #7961
 2021-11-25 11:14:00 +01:00
Luciano Righetti cab5262d65 fix: improve error handling when supervisor is not available or connection settings are wrong 2021-11-25 10:29:16 +01:00
Jakub Onderka d20a68dc38 fix: [internal] Fixes #7961 2021-11-25 10:10:04 +01:00
Jakub Onderka b7fb8de55b
Merge pull request #7991 from JakubOnderka/fix-7987 
chg: [internal] Log when attribute was dropped
 2021-11-25 09:37:50 +01:00
Alexandre Dulaunoy ffc159cfa5
Merge branch '2.4' into develop 2021-11-25 09:06:05 +01:00
Alexandre Dulaunoy 98d46be0ce
chg: [misp-objects] updated to the latest version 2021-11-25 09:03:53 +01:00