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

1973 Commits (6ef27e41f4164a753aa12de2f9579ea5f1b32ca1)

Author SHA1 Message Date
Christophe Vandeplas f4e6e3fb12 regex bugfix in the ids export + suricata export using dns keyword 2014-07-29 14:28:34 +02:00
iglocska 7651f95faa Python scripts to handle the conversion from a MISP JSON event to stix/cybox 2014-07-25 10:47:08 +02:00
iglocska 40baedc531 Merge branch 'feature/templates' into develop 2014-07-19 16:26:36 +02:00
iglocska c64d6a8c93 same org / site admin restriction on freetext importer added 2014-07-19 16:25:43 +02:00
iglocska 61d2fe54ff Start of the stix export tool 2014-07-19 16:24:25 +02:00
iglocska c5ed7531cd Truncated the event info fragment shown in the pivot bubbles by one extra character 2014-07-19 16:03:21 +02:00
iglocska e1988690c6 Merge branch 'feature/templates' into develop 
Conflicts:
	app/Model/Event.php
 2014-07-19 15:51:30 +02:00
iglocska d3d578d622 Update to the main MYSQL.sql file 2014-07-19 15:48:42 +02:00
iglocska bfdd2ee571 Update for the MYSQL scripts for the new features 2014-07-19 15:46:52 +02:00
iglocska ab5b9a9dae Several features finished 
- first version of templating system complete
- first version of freetext importer complete
- first version of mass attribute replace tool complete

- some UI changes
 2014-07-19 15:09:37 +02:00
iglocska 893ef5a129 Freetext import tool 
Added freetext import tool
 2014-07-10 17:02:19 +02:00
iglocska 029ef252a2 Some fixes to the templating 
- resolved bugs with permissions
- fixed the broken mass delete tool
- Fixed an issue with the type not being chosen correctly for file type attributes when created through the templating tool
 2014-07-08 11:31:23 +02:00
iglocska 45d826a252 First version of the templating feature complete 
- still needs some refinement, but it's feature-complete
 2014-07-02 16:20:19 +02:00
iglocska 4b19de1033 Merge branch 'hotfix-2.2.33' into develop 2014-06-27 21:38:31 +02:00
iglocska 4a8ffe2330 Merge branch 'hotfix-2.2.33' 2014-06-27 21:38:13 +02:00
iglocska 72d4db3007 2 Background worker issues fixed 
- Start-up script could only be started from the script's location

- Division by zero in e-mail alerts when calculating the progress of the background job
 2014-06-27 21:36:14 +02:00
iglocska 9bede8e1b4 Further work on the templates 2014-06-25 09:56:33 +02:00
iglocska 6ac105e132 Merge branch 'hotfix-2.2.32' into develop 2014-06-24 13:44:22 +02:00
iglocska 6ccb5948f3 Merge branch 'hotfix-2.2.32' 2014-06-24 13:44:01 +02:00
iglocska b1dafb7057 Removed junk left in the previous commit 2014-06-24 13:43:13 +02:00
iglocska ce4a3679a2 Merge branch 'hotfix-2.2.32' 2014-06-24 13:24:33 +02:00
iglocska aab50a9c44 Update to the way xml files are cached 2014-06-24 13:19:40 +02:00
iglocska a4a987e027 More work on the templates 
- Templates can now be created and populated
- Users can populate an event using a template (still needs work)
- File type elements are not yet implemented
 2014-06-19 08:44:35 +02:00
iglocska 7b3f578025 Further work on the templating system 2014-06-12 13:59:54 +02:00
iglocska f4e5c22865 Work on the templating system 
- create a basic template
- add text elements to the template
- rearrange elements
 2014-06-10 15:18:49 +02:00
iglocska 43d5166859 Merge branch 'hotfix-2.2.31' into develop 2014-06-06 10:47:36 +02:00
iglocska a2acf61e33 Merge branch 'hotfix-2.2.31' 2014-06-06 10:46:28 +02:00
iglocska 7f2df6503e Fix to an incorrect check for privileges in the event deletion 2014-06-06 10:45:53 +02:00
iglocska 19b4a2ae37 Fixes to several ajax related issues 
- malware samples / attachments couldn't be downloaded
- links weren't actually links

- deleting an attribute / shadowattribute now opens a custom confirmation dialogue. This is also where the CSRF tokens are generated for the post request to execute the delete, resulting in a faster event view load
 2014-05-09 23:12:51 +02:00
iglocska ef07046739 Fix to several permission issues 2014-05-07 17:16:19 +02:00
iglocska be9196c339 Merge branch 'hotfix-2.2.30' into develop 2014-05-06 17:11:40 +02:00
iglocska a6c2c392d2 Merge branch 'hotfix-2.2.30' 2014-05-06 17:11:21 +02:00
iglocska 83315ac70a Attributes not edited correctly when pushing an edit through REST api if the event came from a manual export 
- fixed
 2014-05-06 17:10:30 +02:00
iglocska aca5225a06 Merge branch 'hotfix-2.2.29' into develop 2014-05-06 16:02:11 +02:00
iglocska 24c3464d22 Merge branch 'hotfix-2.2.29' 2014-05-06 16:01:55 +02:00
iglocska d56ca766e8 Fixed a copy paste fail in the previos commit 2014-05-06 16:01:31 +02:00
iglocska 77c578ea8e Merge branch 'develop' of https://github.com/MISP/MISP into develop 2014-05-06 15:23:49 +02:00
iglocska 35ba964354 Merge branch 'hotfix-2.2.29' into develop 2014-05-06 15:23:24 +02:00
iglocska 7276d032e4 Merge branch 'hotfix-2.2.29' fixes #259 2014-05-06 15:22:49 +02:00
iglocska 5f5369e930 Better feedback from edits to events failing via REST api. 
- also, site admins can edit events regardless of who the orgc is via the REST api.
 2014-05-06 15:21:52 +02:00
iglocska edc5605e09 Nicer way of resizing activated fields 2014-05-06 11:01:42 +02:00
iglocska ba751a0662 Merge branch 'hotfix-2.2.28' into develop 2014-05-06 10:47:12 +02:00
iglocska 24b9c4d29e Merge branch 'hotfix-2.2.28' 2014-05-06 10:46:29 +02:00
iglocska 2c72b129a5 Update to the installation instructions (fixes #257) and the 2.2 upgrade script 
- fixed 2 incorrect entries in the installation.txt file

- fixed an incorrect variable name in the 2.2 event upgrade script
 2014-05-06 10:44:53 +02:00
iglocska 62987fc667 Merge branch 'hotfix-2.2.27' into develop 2014-05-06 08:53:43 +02:00
iglocska 41ee2d73bd Merge branch 'hotfix-2.2.27' 2014-05-06 08:53:23 +02:00
iglocska 8f3fc159fb Events directly exported from MISP and imported to another instance failed on edit, fixes #259 
- Events exported were enclosed in a <response> tag, which the sync automatically filters out, but a manual export and import would fail on edits

- added a conditional that removes the <response> tag if an event is encapsulated in a request to the edit method
 2014-05-06 08:51:29 +02:00
iglocska 596c9809bb Merge branch 'hotfix-2.2.26' into develop 2014-05-05 17:14:40 +02:00
iglocska 9ceeb5126f Merge branch 'hotfix-2.2.26' 2014-05-05 17:14:14 +02:00
iglocska 0016f448bf Update to the installation instructions, fixes #257 2014-05-05 17:13:42 +02:00