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

10238 Commits (147ab92aa91e54006a9884762d991b43662caf73)

Author SHA1 Message Date
iglocska 147ab92aa9 fix: [api] Fixed event index to include sharing group metadata 2018-12-12 19:24:12 +01:00
iglocska ba74597e87 fix: [Restresponse] fixed XML converter 2018-12-12 19:23:40 +01:00
iglocska a2f073e6d1 fix: [compatibility] reverted IE11 breaking change in misp.js, fixes #3939 2018-12-12 17:53:10 +01:00
iglocska fe3bf1f57a fix: [feeds] Fixed an issue that caused a misp format feed fetch to fail intermittently 2018-12-12 17:30:58 +01:00
iglocska d79757ad73 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-12 16:01:15 +01:00
iglocska c7a4b6f1f5 fix: [sync] Issue with events not updating on a pull 
- overzealous protection removed
- Conditions blocking an event edit via a pull now rely on the locking mechanism, relaxed via an internal sync link
 2018-12-12 15:58:36 +01:00
Sami Mokaddem ac0db78bc1 chg: [eventView] applied quick-edit button for comment field 2018-12-12 15:38:22 +01:00
Sami Mokaddem 1c8601c0e1 chg: [quickEditHover] change variable scope to local 2018-12-12 15:16:01 +01:00
Andras Iklody 5c202618fc
Merge pull request #3940 from mokaddem/issue#3937-quickEdit 
new: [eventview] quick edits are triggered by clicking a button
 2018-12-12 08:55:59 -05:00
Sami Mokaddem e076239a0e new: [eventview] value quickedit are triggered by clicking a button 
And no longer using double-click
 2018-12-12 14:45:18 +01:00
Sami Mokaddem 260f75d8c3 fix: [upload_analysis_file] Prevent object creation on non-existing events 2018-12-12 11:16:00 +01:00
Sami Mokaddem 244f62e355 chg: [eventGraph] added fail save if requiredOneOff is not set 2018-12-12 10:28:08 +01:00
Sami Mokaddem 5140ab0b74 fix: [eventGraph] Object's label gets set correctly 
Add both requiredOneOf and required (forgotten one) fields in the Object's label
 2018-12-12 10:25:18 +01:00
chrisr3d dee614b4b8
fix: [stix 1&2 import] Fixed version attribute of the original filename 2018-12-12 10:19:40 +01:00
chrisr3d 9d0c6fa8fe fix: [doc] Updated install guide to include the latest changes on STIX2 python library 2018-12-11 17:24:41 +01:00
chrisr3d 12b713af35
fix: [stix2 import] Allowing import of STIX 2.0 documents that have non v4 UUIDs 
- Some further operations may be done on those UUIDs later
- Atm, we (at least) avoid loading errors from the stix2 python library
 2018-12-11 15:50:14 +01:00
chrisr3d 06fff3bb32
chg: Bumped lastest cti-python-stix2 changes from our fork 2018-12-11 14:37:02 +01:00
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