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

2846 Commits (f33f7feaa7d4295a4d7e961eab6c22542b1ce70d)

Author SHA1 Message Date
AaronK f33f7feaa7 Merge pull request #1 from aaronkaplan/aaronkaplan-patch-1 
Update UPDATE.txt
 2016-02-01 13:49:20 +01:00
AaronK 22b6bdd725 Update UPDATE.txt 
permissions: it's enough to chown -R www-data /var/www/MISP
 2016-02-01 13:49:04 +01:00
aaronkaplan 3ca4bf96e0 Merge branch 'master' of https://github.com/MISP/MISP 2016-02-01 12:15:01 +01:00
David André 7a28b5be72 Updated version check for cybox to be consistent with documentation 
Related to installation documentation update recommending to use 2.1.0.12 as cybox version (a23027eee4)
 2016-01-20 13:38:18 +01:00
aaronkaplan 04f3650fe1 Merge branch 'master' of https://github.com/MISP/MISP 2016-01-12 11:02:16 +01:00
Andras Iklody 3d8e5add03 Merge pull request #727 from abulhol/master 
added composite domain|ip attribute
 2015-12-31 10:46:07 +01:00
iglocska 45aa7dfd8b Merge branch 'hotfix-2.3.178' 2015-12-14 11:51:37 +01:00
iglocska 4b115c8bfa Fixed an issue with the freetext importer where unsetting a duplicate value would not be reflected in the entry IDs 
- this caused some attributes to be dropped from the end of the list
 2015-12-14 11:50:37 +01:00
iglocska 2213240e5f Merge branch 'hotfix-2.3.177' 2015-12-08 15:27:23 +01:00
iglocska eaab990620 Double quoting of quoted messages in discussion threads fixed 2015-12-08 15:27:03 +01:00
iglocska 77e3c138b2 Merge branch 'hotfix-2.3.177' 2015-12-08 15:19:12 +01:00
iglocska 5f153b36c6 Invalid message fixed when accepting several proposals at once 2015-12-08 15:18:34 +01:00
iglocska 78e58ec2bc Merge branch 'hotfix-2.3.176' 2015-12-08 15:13:59 +01:00
iglocska fbd97df3ac Several fixes, among others fixes #748 
- Double sanitisation when edditing an attribute/proposal comment removed
- Fixed an issue where an ip/resource was recognised as a CIDR notation IP range instead of a url
- Changed the flash message for publishing without e-mails to something less scary
 2015-12-08 15:12:13 +01:00
aaronkaplan 32344f3bee Merge branch 'master' of https://github.com/MISP/MISP 2015-12-07 14:23:46 +01:00
iglocska dfa54efb3c Merge branch 'hotfix-2.3.175' 2015-12-04 15:57:04 +01:00
iglocska 63ca467a0c Fix to a missing Log Model init causing an exception 2015-12-04 15:56:39 +01:00
iglocska 5e79c30974 Fix to the previous fix 
- Flipped it the wrong way, fixed now
 2015-12-04 14:28:02 +01:00
iglocska 3b9f6fa5bb Merge branch 'hotfix-2.3.174' 2015-12-04 14:25:15 +01:00
iglocska a82addb981 Small fix to the previous commit 
- Small fix to a copy-paste fail
 2015-12-04 14:23:42 +01:00
iglocska 76b231c5bb Merge branch 'hotfix-2.3.174' 2015-12-04 11:34:08 +01:00
iglocska 65faeb48d9 Further tweaks 
- fixed some corner cases
- added support for the same defanging to the freetext import tool
 2015-12-04 11:33:14 +01:00
iglocska 744cf50fb9 Update to attribute validation and the freetext import tool, fixes #742 
- defanged URL type attributes are refanged on input
- admin script to do the same for all existing attributes

- admin tool doesn't recognise a word followed by a . as a url
 2015-12-04 10:43:38 +01:00
iglocska 4c7af3e62f Merge branch 'hotfix-2.3.173' 2015-12-02 22:13:14 +01:00
iglocska 7763b63dc2 Junk left in the previous commit 2015-12-02 22:12:54 +01:00
iglocska d9ab688294 Merge branch 'hotfix-2.3.173' 2015-12-02 22:11:03 +01:00
iglocska 9f684d230d Filter and discussion changes 
- event index filtering now accepts POST requests with a json object
  - format has to be filter syntax passed for each field. Example:
    - {"tags":"OSINT|TLP:WHITE|!PRIVINT", "published":"1"}
  - Fixed an issue with no tags being recognised leading to the index returning an unfiltered list
  - Required for filtered pulls from 2.4

- Discussions
  - Event discussion thread initiated on first post instead of first view
 2015-12-02 22:07:54 +01:00
iglocska 58034573a3 Merge branch 'hotfix-2.3.172' 2015-12-02 01:16:07 +01:00
iglocska 864298e9e5 Fix to an incorrect call on sending out alert emails on edit 2015-12-02 01:15:43 +01:00
iglocska 7a9029ec82 Merge branch 'hotfix-2.3.172' 2015-12-02 00:47:20 +01:00
iglocska 0265e92486 Fix to a newly introduced bug that breaks updates of attributes via pulls 2015-12-02 00:46:41 +01:00
iglocska 8b97700325 Merge branch 'hotfix-2.3.171' 2015-12-01 15:40:03 +01:00
iglocska 268c7683a0 Rework of the event add/edit 
- allows for saving an event even if an attribute fails
  - logs attributes that fail validation

- same for edit

- add_misp_export updated with the above in mind
 2015-12-01 15:39:12 +01:00
iglocska 2b7b05b129 Merge branch 'hotfix-2.3.170' 2015-11-30 02:30:39 +01:00
iglocska 85eaea724c Version bump 2015-11-30 02:29:52 +01:00
iglocska 9eb5680ee8 Reimplementation of the Add XML feature 
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures

- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
 2015-11-30 02:28:07 +01:00
aaronkaplan 53b74f722c fixed the documentation (automation) page. The JSON URL was wrong 2015-11-27 19:36:25 +01:00
iglocska 0611648989 Merge branch 'hotfix-2.3.169' 2015-11-27 09:17:13 +01:00
iglocska b30bfab0a5 Delete proposal attachment if the proposal was accepted / discarded 
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
 2015-11-27 09:16:17 +01:00
iglocska d2972ffaee Merge branch 'hotfix-2.3.168' 2015-11-27 08:49:50 +01:00
iglocska 91c4f67ebd Fix to an issue where a proposal with an attachment could not be correctly accepted 2015-11-27 08:49:13 +01:00
iglocska 33bd270c5d Merge branch 'hotfix-2.3.167' 2015-11-26 18:36:43 +01:00
iglocska 8cac54fd66 Updated CakePHP version to 2.7.7 2015-11-26 18:36:25 +01:00
iglocska 04c0581ae1 Merge branch 'hotfix-2.3.166' into develop 2015-11-26 17:13:45 +01:00
iglocska f25920e3a3 Merge branch 'hotfix-2.3.166' 2015-11-26 17:13:21 +01:00
iglocska 72db1ab211 Left off the view file from the previous commit 2015-11-26 17:13:01 +01:00
iglocska f6f3afbdb4 Merge branch 'hotfix-2.3.166' into develop 2015-11-26 17:07:53 +01:00
iglocska 2dca12fbb0 Merge branch 'hotfix-2.3.166' 2015-11-26 17:07:12 +01:00
iglocska 57c5696d96 Backport of a fix to 2.4 adding comments to proposed attachments 2015-11-26 17:06:33 +01:00
iglocska c6d11ecb85 Merge branch 'hotfix-2.3.165' into develop 2015-11-26 16:41:17 +01:00