Commit Graph

16845 Commits (2b7736e3e5a164ea90146e93c67c7304212f85b8)

Author SHA1 Message Date
Luciano Righetti 2b7736e3e5 Merge branch '2.4' into develop 2022-01-14 12:19:53 +01:00
Luciano Righetti 442ea64507 fix: error later on when json enconding a binary repr ipv6 2022-01-14 12:04:35 +01:00
Steve Clement 92144747a4
fix: [i18n] Typo 2022-01-12 17:44:53 +09:00
Jakub Onderka 203cfb2caa
Merge pull request #8065 from fandigunawan/2.4
fix: Removes debug print in AWS S3 Client
2022-01-11 13:52:57 +01:00
Andras Iklody 51e461f44b
Merge pull request #8067 from righel/issue-8064
fix: supervisord_status showing as a worker when its not
2022-01-11 10:17:55 +01:00
Jakub Onderka ee6f35f26c
Merge pull request #8086 from JakubOnderka/event-report-name-required
chg: [internal] Event report name is required
2022-01-10 21:42:19 +01:00
Jakub Onderka a5eba0a619 chg: [internal] Event report name is required 2022-01-10 21:26:16 +01:00
Steve Clement 4f881c8248
Merge pull request #8084 from SteveClement/i18n 2022-01-07 11:24:45 +09:00
Steve Clement ae99fec80f
chg: [i18n] Updated Thai (21%) 2022-01-07 11:23:19 +09:00
Steve Clement c6ce8d2b84
Merge pull request #8082 from SteveClement/i18n 2022-01-07 11:21:13 +09:00
Steve Clement 021334f8cc
fix: [typo] check - not chech 2022-01-07 11:19:49 +09:00
iglocska 1e956aea1a
Merge branch '2.4' into develop 2022-01-06 17:40:32 +01:00
iglocska 5dfda76c48
fix: [galaxyclusters] view by uuid fixed 2022-01-06 17:39:58 +01:00
Alexandre Dulaunoy 809b64c1d5
Merge branch '2.4' into develop 2022-01-06 17:02:02 +01:00
Alexandre Dulaunoy 7ad991efdf
chg: [misp-objects] updated to the latest version 2022-01-06 17:01:40 +01:00
Steve Clement 6483e5b986
Merge branch '2.4' into develop 2022-01-06 18:45:30 +09:00
Steve Clement b549f54fdf
chg: [i18n] default.pot update 2022-01-06 13:16:52 +09:00
Steve Clement 48e13a9ee7
fix: [typo] tagID 2022-01-06 13:12:36 +09:00
Jakub Onderka 49ed062216
Merge pull request #8072 from JakubOnderka/fix-authkeys-valid
fix: [CLI] Authkey valid - reconnect in case of failure
2022-01-05 17:05:02 +01:00
Steve Clement ee6429edda
chg: [i18n] Renamed Thai directory 2022-01-05 17:21:52 +09:00
Steve Clement bc1b877bc5
chg: [i18n] Added Thai, updated active language files 2022-01-05 17:20:18 +09:00
Steve Clement 1b9e9e96fb
chg: [i18n] Update pot files 2022-01-05 17:00:24 +09:00
Alexandre Dulaunoy f19661fb21
Merge branch '2.4' into develop 2022-01-04 15:54:42 +01:00
Alexandre Dulaunoy 9556cd524d
chg: [warning-lists] updated to the latest version 2022-01-04 15:49:36 +01:00
Jakub Onderka 281b6e837f fix: [CLI] Authkey valid - reconnect in case of failure 2022-01-04 10:40:54 +01:00
Luciano Righetti c62a0fdeb3 fix: bug defaulting source_format instead of fixed_event on /feeds/add endpoint. 2022-01-03 08:33:28 +01:00
Jakub Onderka 03d8eb3d66
Merge pull request #8069 from JakubOnderka/security-audit-old-os
chg: [security] Warn about unsupported OS
2021-12-30 16:40:34 +01:00
Jakub Onderka 66f66d7a3c chg: [security] Warn about unsupported OS 2021-12-30 15:13:47 +01:00
Jakub Onderka 22b0dde44e
Merge pull request #8061 from JakubOnderka/authkey-input
fix: [UI] Fix authkey field type
2021-12-30 14:41:40 +01:00
Jakub Onderka 50d284b643
Merge pull request #7986 from JakubOnderka/better-security
chg: [internal] Do not modify session when not necessary
2021-12-30 14:40:01 +01:00
StefanKelm 9897c42ef5
Update Server.php
fix wording
2021-12-30 13:44:10 +01:00
Luciano Righetti 6af197693e fix: supervisord_status showing as a worker when its not 2021-12-30 09:55:52 +01:00
Fandi Gunawan 1591fee9ff
Removes debug print 2021-12-30 02:02:38 +07:00
Jakub Onderka a3c43d2c17 fix: [UI] Fix authkey field type 2021-12-28 19:34:33 +01:00
Luciano Righetti a809b7b1c9 fix: unix timestamps should have a @ prefix 2021-12-28 16:50:08 +01:00
Luciano Righetti 40f83a0329 fix: unix timestamps should have a @ prefix 2021-12-28 16:46:11 +01:00
Luciano Righetti fa4828e11d
Merge pull request #8052 from RichieB2B/ncsc-nl/supervisor
Make supervisor connector work with supervisorphp/supervisor 3
2021-12-24 12:17:36 +01:00
Richard van den Berg 1593fc1be4 fix: make SimpleBackgroundJobs work on RHEL 7 with supervisorphp/supervisor:^3.0 2021-12-24 11:59:45 +01:00
Luciano Righetti 57597b9cd7 fix: change simple bg jobs settings to critical, fix notice in server shell 2021-12-23 14:44:38 +01:00
Jakub Onderka 1caf425b2b
Merge pull request #8039 from JakubOnderka/cake-baseurl-deprecated
chg: [cli] Deprecate `cake baseurl` command
2021-12-22 19:47:54 +01:00
chrisr3d 924dd08cdb Merge branch 'misp-stix' of https://github.com/MISP/MISP into develop 2021-12-22 14:25:16 +01:00
chrisr3d 576f0ff9d5
chg: [misp-stix] Bumped latest version of the library 2021-12-22 14:24:25 +01:00
Alexandre Dulaunoy 43d1fb8ad9
Merge pull request #8047 from RichieB2B/ncsc-nl/sightings-dist
Fix typos
2021-12-22 14:03:01 +01:00
Richard van den Berg 2e303024bf fix: [event:checkDistributionForPush] typos 2021-12-22 13:55:46 +01:00
Andras Iklody 22576b81ba
Merge pull request #8046 from RichieB2B/ncsc-nl/sightings-dist
Use Event model for Sighting context
2021-12-22 13:11:17 +01:00
Richard van den Berg 7b627037d7 fix: [event:uploadEventSightingsToServersRouter] use Event model for Sighting context 2021-12-22 13:05:55 +01:00
Andras Iklody ec07811aed
Merge pull request #8045 from RichieB2B/ncsc-nl/sightings-dist
Allow sightings to be pushed upstream
2021-12-22 13:02:51 +01:00
iglocska b0cd5495cb
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-12-22 13:01:05 +01:00
iglocska 76a0f0617a
chg: [security audit] fixed failures on kernel compilation time
- currently the check makes a lot of invalid assumptions, made it more lax to fail gracefully
2021-12-22 13:00:12 +01:00
Richard van den Berg c7cf1e7be3 fix: [event:uploadEventSightingsToServersRouter] allow sightings to be pushed upstream 2021-12-22 12:11:22 +01:00