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

2726 Commits (c3ebc18afa81a68fa3fa0722cb7a1d0fa8ea8eb4)

Author SHA1 Message Date
Richard van den Berg 2e1864f28d Add Indicated_TTP 2015-07-16 17:49:51 +02:00
Richard van den Berg ab2aeeb868 Add Valid_Time_Position 2015-07-16 12:55:20 +02:00
Richard van den Berg f68bd3f785 Add indicator types 2015-07-16 12:36:42 +02:00
Richard van den Berg c15a178013 Add condition attributes 2015-07-15 17:10:55 +02:00
Iglocska 917851c2d0 Merge branch 'hotfix-2.3.97' into develop 2015-07-13 11:25:23 +02:00
Iglocska a0ce8bf1e6 Merge branch 'hotfix-2.3.97' 2015-07-13 11:24:32 +02:00
Iglocska 28ea167f75 Version bump 2015-07-13 11:24:21 +02:00
Iglocska c906cacd81 Merge branch 'pr567' into hotfix-2.3.97 2015-07-13 11:23:29 +02:00
Iglocska 47ad24fbad Merge branch 'pr564' into hotfix-2.3.97 2015-07-13 11:23:24 +02:00
Iglocska 6a9893affd Merge branch 'pr546' into hotfix-2.3.97 2015-07-13 11:23:19 +02:00
Richard van den Berg 4b5bc3736a Use setupHttpSocket for fetchPGPKey 2015-07-13 11:05:53 +02:00
Iglocska 76cbeeab48 Merge branch 'hotfix-2.3.96' into develop 2015-07-12 21:47:28 +02:00
Iglocska 3f74ed0b39 Merge branch 'hotfix-2.3.96' 2015-07-12 21:46:06 +02:00
Iglocska 1645ee1e3b Rework of the diagnostics for background workers 
- shows dead background workers
- allows site admins to add workers to any queue on the fly
- allows site admins to kill workers on the fly
 2015-07-12 21:45:11 +02:00
David André 2b6ec81891 Edited comment for RPZ_Policy 
Removed copy/pasta and added a correct comment for RPZ_Policy
 2015-07-09 11:49:58 +02:00
David André a4a98009ed Merge pull request #1 from MISP/master 
Update to latest MISP master
 2015-07-09 11:43:26 +02:00
Iglocska 34b5114bb1 Merge branch 'hotfix-2.3.95' into develop 2015-07-09 10:58:05 +02:00
Iglocska aee185be99 Merge branch 'hotfix-2.3.95' 2015-07-09 10:57:25 +02:00
Iglocska 2438ec2f35 Some tuning to the hostname / url type recognition in the freetext import tool, fixes #562 2015-07-09 10:56:17 +02:00
Iglocska 46cb34917b Merge branch 'hotfix-2.3.94' into develop 2015-07-08 10:40:04 +02:00
Iglocska cded8b858e Merge branch 'hotfix-2.3.94' 2015-07-08 10:39:20 +02:00
Iglocska 6a25471ea4 Fix to an error with very large strings in an array causing a failure in the XML conversion of simpleXML, fixes #500 
Moved the XML conversion in restfullEventToServer() to MISP's own xml conversion tool
 2015-07-08 10:37:20 +02:00
Iglocska 7b91058fe8 Merge branch 'hotfix-2.3.93' into develop 2015-07-07 14:45:22 +02:00
Iglocska 01d32cf9cf Merge branch 'hotfix-2.3.93' 2015-07-07 14:44:29 +02:00
Iglocska e706562cd5 Fixes to the RPZ export based on the testing of elhoim 
- some errors in the format (wrong comment character used, rpz-ip not appended to IP addresses, missing semi-colon)
- removed hostnames that are on domains blocked by the rules based on domain attributes
 2015-07-07 14:42:28 +02:00
Iglocska cae28ff687 Merge branch 'hotfix-2.3.92' into develop 2015-07-01 11:07:37 +02:00
Iglocska b2e50768ac Merge branch 'hotfix-2.3.92' 2015-07-01 11:06:40 +02:00
Iglocska 27cc167c33 Fix to an incorrect validation of temporary filenames 2015-07-01 11:06:11 +02:00
Iglocska b433a19c83 Merge branch 'hotfix-2.3.91' into develop 2015-07-01 09:52:18 +02:00
Iglocska b17c447550 Merge branch 'hotfix-2.3.91' 2015-07-01 09:51:59 +02:00
Iglocska 45fdbf7839 File management fixed in server settings 
- a previous patch removed the contents of the page
 2015-07-01 09:50:51 +02:00
Iglocska 137db75099 Merge branch 'hotfix-2.3.90' into develop 2015-07-01 09:02:17 +02:00
Iglocska a8b225c8f5 Merge branch 'hotfix-2.3.90' 2015-07-01 09:01:59 +02:00
Iglocska a05afbdd11 GnuPG.binary demoted to optional setting as it should be 2015-07-01 09:01:32 +02:00
Iglocska a532e64321 Merge branch 'hotfix-2.3.90' into develop 2015-07-01 08:49:53 +02:00
Iglocska 717f616bff Merge branch 'hotfix-2.3.90' 2015-07-01 08:48:47 +02:00
Iglocska 341f1d52de Version bump 2015-07-01 08:45:01 +02:00
Iglocska 812ac878c3 Fix to XSS in the template creation process 2015-07-01 08:42:21 +02:00
Iglocska 415d85102d Security fix: Fix to a possible PHP Object injection 
- unserialized user input replaced with json_decode
 2015-07-01 08:38:40 +02:00
Iglocska c308789e13 Merge branch 'hotfix-2.3.89' into develop 2015-06-29 12:29:09 +02:00
Iglocska 9b67e5ecdb Merge branch 'hotfix-2.3.89' 2015-06-29 12:28:52 +02:00
Iglocska ad5693e7e6 Version bump and debug code removed 2015-06-29 12:28:12 +02:00
Iglocska 96362bdb3d Fix for disabled fields causing issues with the security component fixes #555 
- the disabled fields are no longer created via the form helper
 2015-06-29 12:25:15 +02:00
Iglocska 5b0f20195b Merge branch 'hotfix-2.3.88' into develop 2015-06-29 08:58:32 +02:00
Iglocska 6fb4d488cd Merge branch 'hotfix-2.3.88' 2015-06-29 08:57:46 +02:00
Iglocska 3f215743f0 Complete rework of the ZeroMQ implementation 
- python server running in the background doing the publishing
- MISP -> python script communication via redis
- configurable / controllable via the admin UI
 2015-06-29 08:56:45 +02:00
Iglocska fb6523c956 Merge branch 'hotfix-2.3.87' into develop 2015-06-25 14:24:45 +02:00
Iglocska f00f74ddb3 Merge branch 'hotfix-2.3.87' 2015-06-25 14:24:12 +02:00
Iglocska 73f2944793 Removed debug code 2015-06-25 14:23:27 +02:00
Iglocska a4a49346f5 Merge branch 'hotfix-2.3.87' into develop 2015-06-25 12:24:50 +02:00