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

19554 Commits (ffbb8f21ab80ec68e96de6f1f1d80e6ed13a73ac)

Author SHA1 Message Date
Steve Clement ffbb8f21ab
Merge pull request #7537 from SteveClement/guides 
fix: [doc] Fix conditonal error
 2021-07-02 13:54:16 +09:00
Steve Clement 54e2fab6d9
fix: [doc] Fix conditonal error 2021-07-02 13:52:18 +09:00
Steve Clement 5517895324
chg: [installer] Update to latest version 2021-07-02 13:03:30 +09:00
Steve Clement e3d31c5222
Merge pull request #7536 from SteveClement/tools 
fix: [tools] Catch openssl not being installed
 2021-07-02 13:02:29 +09:00
Steve Clement 68169d25be
Merge pull request #7535 from SteveClement/guides 
chg: [doc] Guides now compatible with Fedora WS/Server 34
 2021-07-02 13:02:14 +09:00
Steve Clement f1f8c75122
fix: [tools] Catch openssl not being installed 2021-07-02 13:01:54 +09:00
Steve Clement c2725e9266
chg: [doc] Guides now compatible with Fedora WS/Server 34 2021-07-02 12:52:03 +09:00
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 396d838f83
chg: [VERSION] bump 2021-06-30 17:17:07 +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
Jakub Onderka 62440a8f9a
Merge pull request #7526 from MISP/2.4 
Merge 2.4 into develop
 2021-06-28 14:29:27 +02:00
iglocska da0b99213d
Merge branch 'develop' into 2.4 2021-06-28 13:34:39 +02:00
iglocska 45758c4ed0
chg: [version] bump 2021-06-28 13:34:13 +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
Steve Clement 2895209069
Merge pull request #7524 from SteveClement/tools 2021-06-28 09:59:35 +09:00
Steve Clement bf035e249e
Merge pull request #7523 from SteveClement/guides 2021-06-28 09:58:57 +09:00
Steve Clement 5489608810
chg: [installer] Added Rocky Linux 8.4 tweaks 2021-06-28 09:57:22 +09:00
Steve Clement 49bf05a9ad
chg: [doc] Added Rocky Linux 8.4 2021-06-28 09:51:30 +09:00
Steve Clement ea31b727fa
Merge branch 'guides' of github.com:SteveClement/MISP into guides 2021-06-28 09:33:43 +09:00
mokaddem b53348e84a
chg: [doc:authentication_diagrams] Included session and cookie handling 2021-06-24 15:52:36 +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