MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
19,547 Commits
58 Branches
373 Tags
196 MiB
Commit Graph

15508 Commits (5568da12bac4dda0b9f8c82f32de84c7a302c72f)

Author SHA1 Message Date
Alexandre Dulaunoy 5568da12ba
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-07-01 17:36:12 +02:00
Alexandre Dulaunoy 24bcc09980
chg: [warning-list] updated 2021-07-01 17:35:55 +02:00
mokaddem 75512c557e
fix: [galaxies:add] Missing entry in sidebar 
Fix #7499
 2021-07-01 16:19:11 +02:00
iglocska 671ebbf92d
Merge branch 'develop' into 2.4 2021-06-30 17:13:29 +02:00
Alexandre Dulaunoy 58b610ffed
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-30 16:20:23 +02:00
Alexandre Dulaunoy 3f449697eb
chg: [warning-lists] updated to the latest version 2021-06-30 16:19:59 +02:00
Jakub Onderka 46542d50be
Merge pull request #7533 from JakubOnderka/audit-log-ui-fix 
fix: [UI] Loading non exists library in Audit log index
 2021-06-30 15:42:34 +02:00
Jakub Onderka 0d86d72184 chg: [log] Remove ObjectRelationship from audit log 2021-06-30 15:28:38 +02:00
Jakub Onderka 1388f3f30b fix: [UI] Loading non exists library in Audit log index 2021-06-30 15:19:36 +02:00
mokaddem 166bc9a885
Merge remote-tracking branch 'origin/2.4' into develop 2021-06-30 12:43:03 +02:00
mokaddem 55243bf5c6
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-30 12:42:28 +02:00
mokaddem 8921b3b3ba
fix: [event:add] Typo in accessing sharing group roaming information 2021-06-30 12:41:07 +02:00
Luciano Righetti 01521d614c security: fix stored xss in sharing groups view as reported by Nicolas Vidal from TEHTRIS. 2021-06-29 11:46:27 +02:00
Jakub Onderka 09e6d41fdf
Merge pull request #7482 from JakubOnderka/authkey-read-only 
new: [API] Read only authkeys
 2021-06-29 10:13:08 +02:00
Jakub Onderka 6f1be54074
Merge pull request #7527 from JakubOnderka/response-simplify 
chg: [internal] Simplify generating some JSON responses
 2021-06-29 10:12:55 +02:00
Jakub Onderka 5fbac2d000 chg: [internal] Simplify generating some JSON responses 2021-06-28 14:43:24 +02:00
iglocska da0b99213d
Merge branch 'develop' into 2.4 2021-06-28 13:34:39 +02:00
Alexandre Dulaunoy 0d9e2498df
chg: [misp-objects] updated to the latest version 2021-06-28 13:17:40 +02:00
Alexandre Dulaunoy 98b3f1b38a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-28 13:17:12 +02:00
Alexandre Dulaunoy 2459cf8485
chg: [misp-warninglists] updated to the latest version 2021-06-28 13:16:50 +02:00
Alexandre Dulaunoy d72e29068d
chg: [taxonomies] updated to the latest version 2021-06-28 13:16:29 +02:00
Jakub Onderka 017249451b new: [API] Read only authkeys 2021-06-28 12:41:10 +02:00
mokaddem fa42bfd794
chg: [servers:add] Fallback to correct json structure if synchronisation rules are empty 2021-06-24 15:39:37 +02:00
mokaddem f5485f2711
Merge remote-tracking branch 'origin/2.4' into develop 2021-06-24 08:40:51 +02:00
mokaddem 2fde6476dc
security: [generic-template:index] Fixed unsanitized input 2021-06-24 08:39:51 +02:00
mokaddem d97b5e9e94 Merge remote-tracking branch 'origin/2.4' into develop 2021-06-23 13:52:24 +02:00
Sami Mokaddem ff8f14bf0a
fix: [server:edit] Typo in index 2021-06-23 13:47:56 +02:00
iglocska 4b739033cc
Merge branch '2.4' into develop 2021-06-22 16:58:05 +02:00
iglocska 65c30ce806
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-22 16:57:43 +02:00
iglocska 625553fab5
fix: [user edit] lost the set password checkbox 2021-06-22 16:56:57 +02:00
Alexandre Dulaunoy 7d59e49cdc
Merge branch '2.4' into develop 2021-06-22 07:29:32 +02:00
Alexandre Dulaunoy 031d7ac166
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-22 07:29:05 +02:00
Alexandre Dulaunoy 2dfa8c07e4
chg: [misp-galaxy] updated to the latest version 2021-06-22 07:25:38 +02:00
Jakub Onderka e34e6d5813
Merge pull request #7495 from JakubOnderka/warninglist-import 
Warninglist import
 2021-06-21 13:13:56 +02:00
Jakub Onderka c1131beacc
Merge pull request #7494 from JakubOnderka/cake-composer-support 
new: [internal] Support Cake installation by composer
 2021-06-21 09:59:48 +02:00
iglocska c989d55f44
fix: [server caching] only push data to redis / logs if there's something to push 
- avoids the count() notice if no data was returned by the remote
 2021-06-21 08:45:11 +02:00
iglocska 3d794b62a9
fix: [server caching] only push data to redis / logs if there's something to push 
- avoids the count() notice if no data was returned by the remote
 2021-06-21 08:44:11 +02:00
iglocska 0311b43e08
Merge branch '2.4' into develop 2021-06-21 08:15:49 +02:00
iglocska 3a28edb4e4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-06-21 08:15:28 +02:00
iglocska 661efc131e
fix: [user add/edit] added missing JS change to restore the external auth field 2021-06-21 08:14:51 +02:00
Andras Iklody e07cee9ae8
Merge pull request #7504 from mokaddem/fix-server-url-validation 
Fix server url validation
 2021-06-20 10:14:13 +02:00
Alexandre Dulaunoy 261c1c3a81
Merge branch '2.4' into develop 2021-06-18 14:32:58 +02:00
Alexandre Dulaunoy b4c6b1a430
Merge pull request #7506 from adliwahid/patch-1 
Added 3 feeds sources from APNIC
 2021-06-18 14:32:02 +02:00
Luciano Righetti 2f92be64c8 fix: add mising return formats for rest search endpoints. 2021-06-18 10:00:39 +02:00
Luciano Righetti 7ab7b94db5 fix: add mising return formats for rest search endpoints. 2021-06-18 09:57:51 +02:00
Luciano Righetti d637a1fcf9 fix: add missing returnFormat to restSearch endpoints, move the parameter as requestBody property. 2021-06-18 09:29:52 +02:00
Adli Wahid ff594d4496
Added 3 feeds sources from APNIC 
Added 3 daily feeds (ssh bruteforce, telnet bruteforce, URLs seen)  from the APNIC Community Honeynet Project
 2021-06-18 12:29:34 +10:00
mokaddem 56a9e222c4
Merge branch 'develop' of github.com:MISP/MISP into fix-server-url-validation 2021-06-17 14:16:44 +02:00
mokaddem abbed47cb9
chg: [server] Relaxed url validation rule 2021-06-17 14:15:57 +02:00
iglocska 5b318d12a6
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-06-16 14:32:36 +02:00