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

19807 Commits (52cda9736ce893b39895b9655990dd7a9f7425a8)

Author SHA1 Message Date
Jakub Onderka 6e61258e0d fix: [API] Check if user can view object that contains reference 2021-07-07 12:38:49 +02:00
Jakub Onderka a1612722f1 fix: [UI] Trim object UUID when adding reference 2021-07-07 12:38:49 +02:00
Jakub Onderka 42b62fb3da fix: [internal] Change exception type 2021-07-07 12:38:49 +02:00
Jakub Onderka c14e070912 fix: [internal] Relationship import 2021-07-07 12:38:49 +02:00
Alexandre Dulaunoy fa681622d7
Merge remote-tracking branch 'origin' into develop 2021-07-07 12:28:34 +02:00
Alexandre Dulaunoy d345ba6761
chg: [misp-objects] updated to the latest version 2021-07-07 12:27:51 +02:00
Sebastiano Mariani c51ef9da8e fix: wrong attribute value hash computed inside checkForDuplicateObjects function 
Signed-off-by: Sebastiano Mariani <smariani@vmware.com>
 2021-07-06 11:44:26 -07:00
Jakub Onderka 4fcc68e0a6
Merge pull request #7540 from MISP/2.4 
Merge 2.4 to develop to fix build
 2021-07-02 11:56:40 +02:00
Jakub Onderka 10cd1ed65d chg: [internal] Remove JS helper from controllers 2021-07-02 10:04:10 +02:00
Jakub Onderka 6847bfe6fa
Merge pull request #7532 from JakubOnderka/warninglist-quick-delete 
fix: [internal] Faster deleting warninglist
 2021-07-02 09:15:31 +02:00
Steve Clement 0c25b72072
chg: [installer] Update to latest version 2021-07-02 13:54:37 +09:00
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
mokaddem 7f72702b3f
fix: [galaxies:add] Missing entry in sidebar 
Fix #7499
 2021-07-01 16:07:45 +02:00
mokaddem 1d44d62625
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-07-01 12:50:40 +02:00
mokaddem 21bf638a11
fix: [install:MySQL] Removed org_blacklists table creation 
Fix #7476
 2021-07-01 12:50:27 +02:00
Jakub Onderka 30220e86da
Merge pull request #7525 from JakubOnderka/deprecate-getpymisp-version 
chg: [API] Deprecate getPyMISPVersion
 2021-07-01 09:42:30 +02:00
iglocska f6325c50ee
Merge branch '2.4' into develop 2021-06-30 17:17:50 +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
Jakub Onderka 61106fc7c1 chg: [internal] Regenerate warninglist cache just when save was successful 2021-06-30 14:52:41 +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
Jakub Onderka d61b4cb2f2 chg: [internal] Use less memory when inserting warninglist to db 2021-06-30 12:06:22 +02:00
Jakub Onderka 2c341029b5 fix: [internal] Faster deleting warninglist 2021-06-30 10:58:56 +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
Luciano Righetti e308a4fda4 fix: remove required attr from hidden inputs in add attribute form 2021-06-28 16:03:08 +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