MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
12,506 Commits
41 Branches
370 Tags
181 MiB
Commit Graph

12506 Commits (5bc0834bac35e9f19bfc017d19c0f87ab1059c4c)

Author SHA1 Message Date
Steve Clement f215a66506
chg: [doc] Added more bits to GPG key. 2019-06-15 11:24:00 +09:00
chrisr3d e85513307d Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-14 18:23:04 +02:00
chrisr3d 61852c0f9a
fix: [enrichment] Added missing variable 2019-06-14 18:22:28 +02:00
chrisr3d cf20d07cad
add: [enrichment] Displaying + returning tags at attributes level from the module results 
- If one of our UI master could review this and find
  a better way of displaying the tags at attribute
  level in the module results view, it would be
  very cool :D
 2019-06-14 18:16:09 +02:00
chrisr3d 8642bc5802
add: [enrichment] Attaching event level tags returned by the module results 2019-06-14 18:11:47 +02:00
Steve Clement c2c01810ca
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard. (#4748) 
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard.
 2019-06-15 00:15:22 +10:00
Steve Clement 1340a1853f
Merge branch '2.4' into tools 2019-06-14 23:14:07 +09:00
Steve Clement ef1235ba69
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums. (#4747) 
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums.
 2019-06-15 00:13:36 +10:00
Steve Clement 5cb723b37c
chg: [tools] Added MISPvars from the installer. Added PATH_TO_MISP as a standard. 2019-06-14 23:11:38 +09:00
Steve Clement 60f85f4449
Merge branch '2.4' into guides 2019-06-14 22:55:39 +09:00
Steve Clement 20987df620
chg: [installer] Added ask_o () for input validation, fixed tr to be more uniform. Updated installer checksums. 2019-06-14 22:53:10 +09:00
chrisr3d 0613469b83
add: [enrichment view] Displaying event level tags 2019-06-13 19:51:24 +02:00
chrisr3d 58cd920737 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 19:44:47 +02:00
chrisr3d 57766f03e1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-13 19:43:59 +02:00
chrisr3d 447a7b2a30
fix: [stix import] Better handling of missing python libraries 2019-06-13 19:41:57 +02:00
StefanKelm 2757d58f44
Update edit.ctp 
Clarification that "Fetch GnuPG key" actually connects to the MIT key server
 2019-06-13 16:00:29 +02:00
StefanKelm 22345a747d
Update EventBlacklistsController.php 
(minor) aligns the text with app/Controller/Component/BlackListComponent.php
 2019-06-13 14:57:10 +02:00
chrisr3d 9a7afea9da Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 14:20:10 +02:00
iglocska 5d611c39ff
fix: [ajaxTypes] copy pasta fixed 2019-06-13 14:19:47 +02:00
chrisr3d 8ee694b657 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 14:18:35 +02:00
iglocska 99884f371d
chg: [reusability] Further modifications - have an on-demand static mode for ajaxTags 2019-06-13 14:18:06 +02:00
chrisr3d b7b4002fc7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 14:16:39 +02:00
iglocska 58b5e36fe3
chg: [reusability] modified ajaxTags to massage the data a bit for code-reuse 2019-06-13 14:15:55 +02:00
iglocska add2719c99
chg: [VERSION] bump 2019-06-13 09:36:04 +02:00
Alexandre Dulaunoy 41d6e332f3
chg: [misp-galaxy] updated to the latest version 2019-06-13 09:27:02 +02:00
Steve Clement ac4b86c275
chg: [installer] Updated Installer and chksums to latest (#4740) 
chg: [installer] Updated Installer and chksums to latest
 2019-06-13 10:10:41 +10:00
Steve Clement 70af77c40f
chg: [installer] Updated Installer and chksums to latest. 2019-06-13 09:09:34 +09:00
Steve Clement 62d7d7498a
Merge branch '2.4' into guides 2019-06-13 09:09:27 +09:00
Steve Clement 3d851a928d
Merge pull request #4734 from cvandeplas/2.4 
fix: [installer] added missing python zmq lib
 2019-06-13 10:08:48 +10:00
Steve Clement 081f9b526c
chg: [doc] Added ZMQ to the procedure 2019-06-13 09:06:18 +09:00
Steve Clement 706ba0dcbd
fix: [installer] Commit: 1716ca7da9 regressed the installer to an earlier version. 2019-06-13 08:44:44 +09:00
chrisr3d 1716ca7da9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-12 17:02:53 +02:00
chrisr3d f2ea6b8246
add: [stix import] Supporting additional marking & namespace 2019-06-12 16:59:24 +02:00
iglocska 8d95ca082f
fix: [UI] weird blue button fixed 2019-06-12 15:56:11 +02:00
iglocska 3cb1e27ab2
Merge branch 'eventblacklist' into 2.4 2019-06-12 15:54:06 +02:00
iglocska 6965c83fc1
new: [eventblacklist] Added search filters 
- We really need a DISP - development information sharing platform
 2019-06-12 15:53:13 +02:00
mokaddem b42f803110 chg: bumped queryversion 2019-06-12 15:31:06 +02:00
mokaddem c6fee5bc4f new: [eventBlacklist] Added support of bulk deletion of entries. Fix 2019-06-12 15:27:39 +02:00
iglocska 3bcd7c57a3
chg: [querystring] bump 2019-06-12 14:24:14 +02:00
Andras Iklody fbef06c0ca
Merge pull request #4635 from mokaddem/galaxyMatrixImprovements 
Galaxy matrix improvements
 2019-06-12 14:23:35 +02:00
Andras Iklody 12ff195339
Merge pull request #4672 from mokaddem/mergeAttributeIntoObjects 
Merge attributes into objects
 2019-06-12 14:23:13 +02:00
mokaddem 2cbec48f0f Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-12 14:23:01 +02:00
Andras Iklody 669383ca60
Merge pull request #4722 from certbe-trey/2.4 
enable misp-wipe where MySQL datastore isn't on localhost
 2019-06-12 14:16:35 +02:00
mokaddem 4fcd8dc55d Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-06-12 14:14:22 +02:00
mokaddem 210477eaaa chg: bumped queryversion 2019-06-12 14:13:25 +02:00
mokaddem f850abcdaa fix: [galaxyMatrix] Handle case if deprecated galaxy does not exists 2019-06-12 14:12:06 +02:00
mokaddem 99b6ff84bc Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-12 13:22:43 +02:00
mokaddem 2cb785bc0b fix: [galaxyMatrix] Catch error if no element in column 2019-06-12 13:22:12 +02:00
mokaddem 7a6a22e84a fix: [galaxy:add] Fix #4733 (adding galaxies on attribute) 2019-06-12 13:10:47 +02:00
mokaddem 2035aa8c7c chg: [object:fromAttributes] Deleted comments and hardcoded table name 2019-06-12 12:05:13 +02:00