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

10221 Commits (f02ae5b58dc4d842df2b3913d7e2840eb1f8e9b9)

Author SHA1 Message Date
chrisr3d f02ae5b58d
chg: [stix] Changed cti-python-stix2 submodule to our fork 2018-12-11 14:35:45 +01:00
Alexandre Dulaunoy 6a60438229
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-11 14:13:15 +01:00
Alexandre Dulaunoy cef0931d46
chg: [misp-galaxy] updated to the latest version 2018-12-11 14:12:21 +01:00
iglocska 47c9f6114e fix: [API] Attribute tags could be added by 3rd parties via the API 
- fixed
 2018-12-11 11:36:40 +01:00
Alexandre Dulaunoy cf1b346580
Merge pull request #3932 from davidonzo/2.4 
Mod headers to be enabled
 2018-12-11 10:42:11 +01:00
Davide Baglieri cb11e2f025
Mod headers to be enabled 
Apache configuration needs to load the headers module.
Added the line #103
 2018-12-11 10:35:34 +01:00
Andras Iklody 2198ec339c
Merge pull request #3927 from cvandeplas/2.4 
fix: [objecttemplates] fixes issue #3921
 2018-12-09 12:58:14 -05:00
Christophe Vandeplas 589070a5cd fix: [objecttemplates] fixes issue #3921 2018-12-09 14:58:25 +01:00
Alexandre Dulaunoy 8982fdac8a
chg: [taxonomies] updated to the latest version 2018-12-09 12:18:30 +01:00
Andras Iklody c733857fef
Merge pull request #3924 from keram79/patch-1 
Fix error handling in Server.php
 2018-12-08 09:41:06 -05:00
iglocska 2aef86abf1 fix: [API] tags/attachTagToObject wasn't unpublishing events correctly 2018-12-07 16:33:08 +01:00
chrisr3d 8ce3d46a91 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-07 15:40:18 +01:00
chrisr3d 87190f6510
fix: [restSearch] Using the correct python version to call STIX scripts 
- Using the correct python defined in virtual env,
  if available, and the default global python3
  otherwise
 2018-12-07 15:31:04 +01:00
Sami Mokaddem 3e8b96a13d fix: [attachement] prevent creation of empty event 2018-12-07 15:01:37 +01:00
keram79 e34e62efe8
Fix error handling in Server.php 
according to http://php.net/manual/de/exception.getmessage.php , the parenthesis are required
 2018-12-06 19:42:44 +01:00
Raphaël Vinot 083beae502
chg: Bump PyMISP recommended version 2018-12-06 15:27:02 +01:00
Alexandre Dulaunoy 631f21f856
chg: [PyMISP] updated to the latest version 2018-12-06 15:24:02 +01:00
iglocska c1ad4abf8f chg: [version] bump 2018-12-06 14:56:43 +01:00
chrisr3d aea66ccac1
fix: [stix import] Fixed missing event fields import 
- Such as event info, event date and so on
 2018-12-06 14:39:47 +01:00
iglocska 6d6528a4bc fix: [STIX2] fixed stix2 to use the internal original file capture 2018-12-06 12:06:42 +01:00
iglocska 06fd4bba4e fix: [internal] Fixed the original file capture tool 2018-12-06 12:01:30 +01:00
iglocska 9d527ee8f5 fix: [UI] Fixed event edit warning 2018-12-06 11:57:18 +01:00
iglocska 6dfeb8934b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-06 11:47:55 +01:00
iglocska 211ac07372 fix: [internal] Handle the upload of original versions of ingested files via a helper function instead of leaving it to external tools 2018-12-06 11:47:14 +01:00
chrisr3d 6dc88f1e1a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-06 11:43:35 +01:00
chrisr3d 768d87e9de
fix: [stix import] Fixed indicators parsing 
- For stix1 generated with MISP
 2018-12-06 11:41:30 +01:00
chrisr3d c633fb3c12
fix: [stix import] Made sure the header description value fetching test is working is all cases 2018-12-06 11:40:19 +01:00
Andras Iklody 3e4e75014b
Merge pull request #3912 from Sh3idan/fix-incoherence-types-and-categories 
fix: [model-data] Network activity category: add x509-...-md5 and x509-...-sha256
 2018-12-05 04:20:53 -05:00
iglocska b9d4888f27 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-05 09:40:28 +01:00
iglocska 258e548d9d fix: [UI] Fixed crappy old style flash mesage on events/add that has been an eye sore for ages 2018-12-05 09:39:51 +01:00
iglocska 20b37d7a87 new: [usability] Object templates view also accepts uuid as input vector 2018-12-05 09:35:19 +01:00
iglocska 3c227f0621 new: [UI] Added warning for users not to edit events as site admins 2018-12-05 09:34:46 +01:00
chrisr3d 0469b4848d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-04 12:01:51 +01:00
chrisr3d d7cc403826
fix: [stix import] Fixed header description value fetching 
- Again yes, but with the correct test now
 2018-12-04 11:59:44 +01:00
Alexandre Dulaunoy ac991483ca
chg: [misp-galaxy] updated to the latest version 2018-12-04 11:26:33 +01:00
iglocska 48b84a04fd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-04 11:07:08 +01:00
Raphaël Vinot 1f71883778 chg: Bump PyMISP 2018-12-03 17:52:08 +01:00
Raphaël Vinot 24fdc34df8
chg: Bump PyMISP recommended version. 2018-12-03 17:15:23 +01:00
iglocska 7759c62a8e new: [CLI] Documentation updated 2018-12-03 11:08:06 +01:00
iglocska 33b5fa8535 fix: [CLI] Added bruteforce protection cleaning 2018-12-02 21:39:01 +01:00
iglocska 601e05bb4a new: [Rest] Added system for GET requests in the templating system 2018-12-01 09:23:03 +01:00
chrisr3d b24c204b3a
fix: [stix2 import] Fixed pattern parsing for a specific case 2018-11-30 14:53:16 +01:00
iglocska b5e27db081 new: [ReST] Added statistics 2018-11-30 12:15:08 +01:00
Steve Clement 9546fced37
Merge pull request #3914 from SteveClement/guides 
chg: [doc] Some format updates to config files
 2018-11-30 14:49:09 +09:00
Steve Clement d0a03c0f4f chg: [doc] Updated CentOS 7 Install instructions to use SSL 2018-11-30 14:45:42 +09:00
Steve Clement ff2782c66e chg: [doc] Some format updates to config files 
new: [doc] CentOS SSL apache config
fix: [doc] Fixed symlink to Ubuntu webmin instructions
 2018-11-30 14:40:24 +09:00
co59 bbeef129c0 fix: [model] Network activity category: add x509-fingerprint-md5 and x509-fingerprint-sha256 2018-11-29 23:07:11 +01:00
Raphaël Vinot ff0b81efaa chg: Bump PyMISP 2018-11-29 18:15:31 +01:00
Raphaël Vinot a76fec3c20 chg: Bump PyMISP 2018-11-29 17:48:49 +01:00
iglocska 0365cb19b1 fix: [API] previous commit fixed 2018-11-29 17:18:42 +01:00