MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
6,648 Commits
63 Branches
383 Tags
216 MiB
Commit Graph

6648 Commits (67d37a283faab5c95e88cb539743b26c8e2743d6)

Author SHA1 Message Date
iglocska e18344b3f5 fix: several fixes to the feed overlay matrix 
- lookup was broken for csv/freetext feeds
- allow users to see the feeds if the admin allows it
 2017-05-09 16:35:59 +02:00
iglocska f0136d5774 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-09 14:26:02 +02:00
iglocska da3d841117 fix: Make redis optional (for now) 2017-05-09 14:22:17 +02:00
Alexandre Dulaunoy 9cb8d00b4a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2017-05-09 11:02:40 +02:00
Alexandre Dulaunoy c59ee781fa fix: PyMISP updated to the latest version 2017-05-09 11:02:09 +02:00
Andras Iklody eef8b55120 Merge pull request #2128 from deloittem/2.4 
Snort attribute generation rule now contains the initial msg field
 2017-05-09 10:46:47 +02:00
iglocska 765ce33575 Merge branch '2164' into 2.4 2017-05-09 10:44:04 +02:00
iglocska bd82d47444 fix: Fixed two looping issues in the feed analysis matrix 
- fixed cache age counter going ape****
- fixed the overlap value counters in the graph popovers
 2017-05-09 10:37:01 +02:00
iglocska eb6a5e7000 new: Update all the json structures in MISP via the API, fixes #2168 
- Just post to the following APIs as a site admin:
  - /warninglists/update
  - /galaxies/update
  - /taxonomies/update
 2017-05-09 09:00:58 +02:00
Alexandre Dulaunoy da57a4af67 fix: misp-taxonomies updated to the latest version 2017-05-08 23:01:48 +02:00
Alexandre Dulaunoy fec573cbdb fix: misp-galaxy updated to the latest version 2017-05-08 23:01:02 +02:00
iglocska a9ac025785 fix: Removed an invalid check causing travis to fail 2017-05-08 16:34:42 +02:00
iglocska 6d39e6f191 chg: Version bump on the queryVersion 2017-05-08 16:24:50 +02:00
iglocska 97109a0b4b fix: Version bump 2017-05-08 16:23:50 +02:00
iglocska cc139a5818 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-08 16:17:51 +02:00
iglocska 90eef89223 fix: Several feed fixes 2017-05-08 16:17:34 +02:00
iglocska 7f9cb271f7 Merge branch 'feature/feedanalysis' into 2.4 2017-05-08 16:00:14 +02:00
iglocska a5465a2b0c fix: Added overlap count to the feed analysis hover 2017-05-08 15:59:34 +02:00
iglocska 96574ec335 new: First implementation of the feed analysis system 2017-05-08 14:22:27 +02:00
Ángel González 3e804b0772 Remove extraneous </div> 2017-05-08 00:46:02 +02:00
Ángel González 21baa538c9 Reorder </div> and </form> to be properly nested 2017-05-08 00:46:02 +02:00
Ángel González 926895733b Cosmetic changes 
Change space indents to tabs
Remove ?> at end of file
Add or remove some indentation where appropriate
 2017-05-08 00:45:57 +02:00
Ángel González 45ef670178 Minor tweaking of comments 2017-05-08 00:35:07 +02:00
Andras Iklody b2a7778758 Merge pull request #2163 from ppanero/bro_export 
[WIP] - BroExport types updeted
 2017-05-05 16:50:44 +02:00
Pablo Panero 153926e0af BroExport types updeted 2017-05-05 16:38:38 +02:00
Andras Iklody f53c5a0b7d Merge pull request #2161 from Keisial/2158 
Change feedback about email notification on sending proposals
 2017-05-05 07:19:02 +02:00
Ángel González 620bb6dad0 Change feedback about email notification on sending proposals 
Move from a “Failed for at least one recipient” warning notification
to warn when it was not sent to anyone, which is more interesting for
the user sending the proposal.

Fixes #2158
 2017-05-05 01:26:12 +02:00
iglocska 17984f4845 chg: In preparation of the various taxonomy types, only update event type taxonomies or ones without a type 2017-05-04 10:21:53 +02:00
iglocska 8d8e4c6201 fix: Added unpublish_event not being loaded 2017-05-03 16:52:42 +02:00
iglocska d32fc05a35 Merge branch 'feature/cortex' into 2.4 2017-05-03 16:36:45 +02:00
iglocska 0355b9e7e0 chg: Added scroll bar to large cortex object popups 2017-05-03 16:36:11 +02:00
iglocska d0e57bede6 fix: Better centering of the cortex object popup 2017-05-03 15:27:09 +02:00
iglocska b0c484efde new: Cortex objects shown in popup 2017-05-03 15:23:51 +02:00
iglocska 7b24077245 fix: Missing parameters for getenabledmodules 2017-05-03 14:41:39 +02:00
iglocska 26d3e2a0c2 fix: Fixed a failure with cortex modules (hopefully) 2017-05-03 14:27:23 +02:00
iglocska 9ccdc579a6 new: New module type: Cortex 
- similar to Enrichment modules except for not having the options to run hover
 2017-05-03 13:13:36 +02:00
iglocska ebd69bf59d fix: Set a default colour for tags in the feed preview that don't have a colour set. 2017-05-03 09:34:21 +02:00
iglocska af9efaacb8 fix: Reduced the data pushed to the view for the tag index, potentially resolves #2156 2017-05-03 09:28:30 +02:00
iglocska 021d25c708 new: New type - cortex 
- raw cortex output json
 2017-05-02 17:02:21 +02:00
iglocska 68718fed99 fix: Set the content header for module lookups 2017-05-02 16:42:45 +02:00
iglocska 0e085d9d9c Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-02 15:20:55 +02:00
iglocska 10439db238 chg: Change to the CIRCL pgp keyserver instead of the slowpoke MIT one 2017-05-02 15:20:30 +02:00
Andras Iklody 120265b185 Merge pull request #2154 from truckydev/2.4 
Add filename key for import modules
 2017-05-02 14:34:06 +02:00
Tristan METAYER 98aafc3c49 add test for empty filename 2017-05-02 14:30:53 +02:00
iglocska c20b729afd Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-05-02 11:04:13 +02:00
iglocska ec83f378da new: Use /events/freeTextImport/eventid via the API to directly parse and create attributes from the input 
- expected format is {"value": "my_string_to_parse"} with "distribution" being an optional value (otherwise instnace defaults are assumed)
 2017-05-02 11:02:11 +02:00
Tristan METAYER 9c349caa44 Add filename key for import modules 2017-05-02 10:56:21 +02:00
Andras Iklody 699be1ed30 Merge pull request #1947 from SekoiaLab/fix/install_sql 
Fix/install sql
 2017-04-30 18:42:45 +02:00
iglocska ecf00e8c65 fix: Fixed an issue where certain filters removed some elements from the object counter, fixes #2151 2017-04-27 17:09:26 +02:00
iglocska d33b3b1434 fix: Left off controller changes in the previous commit 2017-04-27 16:13:00 +02:00