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

1726 Commits (be19976da4f91212a939fd87ed5b7bfff9490bfb)

Author SHA1 Message Date
iglocska be19976da4 Merge branch 'hotfix-2.2.39' 2014-09-08 13:34:43 +02:00
iglocska 4c6ea92ba3 Small fix to avoid repeated incorrect invalid messages after the first failed check 2014-09-08 13:34:14 +02:00
iglocska f7bfbc91d7 Merge branch 'hotfix-2.2.39' 2014-09-08 13:24:09 +02:00
iglocska 2bb806d780 Fix to the PGP key validation tool, fixes #284 2014-09-08 13:23:23 +02:00
iglocska b02737ec47 Merge branch 'hotfix-2.2.38' 2014-08-28 10:17:31 +02:00
iglocska e5806906ed Fixed authored date format, closes #283 2014-08-28 10:17:00 +02:00
iglocska ef20ec8500 Merge branch 'hotfix-2.2.37' 2014-08-21 15:28:58 +02:00
iglocska b6ee897b82 Fixed an incorrect check for the no PGP key warning condition partially responsible for #271 2014-08-21 15:27:25 +02:00
iglocska 51189ab852 Merge branch 'master' of https://github.com/MISP/MISP 2014-08-14 17:27:48 +02:00
iglocska 530ea7e55a Merge branch 'hotfix-2.2.36' 2014-08-14 17:27:20 +02:00
iglocska 1e6c9e662f Fixes authentication issues for some exports 
- some exports did not allow users to authenticate via passing the auth key through the header
 2014-08-14 17:26:40 +02:00
iglocska 744420ddf3 Merge branch 'hotfix-2.2.35' 2014-08-13 16:13:54 +02:00
iglocska cf3809ef74 Further work on the previous patch 2014-08-13 16:13:38 +02:00
iglocska 315b29b0d5 Merge branch 'hotfix-2.2.35' 2014-08-13 15:35:45 +02:00
iglocska 97eba22b46 Fix to the previous commit 2014-08-13 15:35:22 +02:00
iglocska 26a4f97adb Proposal validation now calls the Attribute validation method instead of using the (incorrect) duplication in ShadowAttribute 2014-08-13 15:24:22 +02:00
iglocska d0e121846c Missing validation for http-method in Shadow-Attributes 2014-08-13 15:21:16 +02:00
iglocska 04b26743fa Merge branch 'hotfix-2.2.34' 2014-08-06 13:47:26 +02:00
iglocska f86bb89e14 Commas in CSV now escaped properly fixes #281 2014-08-06 13:46:52 +02:00
Alexandre Dulaunoy 65ed10fe12 Update INSTALL.txt 
Fix #252
 2014-08-02 09:16:16 +02:00
Christophe Vandeplas 2b932d7b0f Merge branch 'hotfix/export_suricata' 2014-07-29 14:30:02 +02:00
Christophe Vandeplas f4e6e3fb12 regex bugfix in the ids export + suricata export using dns keyword 2014-07-29 14:28:34 +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 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 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 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 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 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 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 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 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
iglocska af31b78f4d Merge branch 'hotfix-2.2.25' 2014-05-05 12:12:49 +02:00
iglocska 04e7220936 Fixed an issue with an incorrect timestamp comparison for attributes, allowing the update of an attribute with an older version 2014-05-05 12:12:02 +02:00
iglocska 162389c4c8 Merge branch 'hotfix-2.2.24' 2014-04-30 11:00:40 +02:00
iglocska dac1c2b17c CSV export now includes date for each attribute, fixes #255 2014-04-30 11:00:20 +02:00
iglocska 123ba4f8c3 Merge branch 'hotfix-2.2.23' 2014-04-28 14:51:20 +02:00
iglocska 8bb47c863d Incorrect default timeout value fixed in core.php 2014-04-28 14:50:47 +02:00
iglocska 1c9b621654 Merge branch 'hotfix-2.2.22' 2014-04-22 10:38:49 +02:00
iglocska 9640dcd4ed Automation authentication via header fixes #254 
- Authentication via headers was only allowed if _isRest() returned true
- this only happened for pages returning JSON or XML content

- a new check, _isAutomation() was added that allows authentication via headers for certain methods used by the automation system
 2014-04-22 10:36:37 +02:00