MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
8,975 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

8975 Commits (ce6c8752c016f58ca4f3c5186d43aab04d371d4f)

Author SHA1 Message Date
chrisr3d ce6c8752c0 Merge branch '2.4' of github.com:MISP/MISP into stix2 2018-07-30 15:09:43 +02:00
Alexandre Dulaunoy 6a1c895b0a
fix: [tests] CSV export 2018-07-30 14:54:45 +02:00
iglocska 4dbf6705ca Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-30 00:10:01 +02:00
iglocska 9756ba5d51 fix: [galaxies] Fixed same value across two namespaces causing issues 2018-07-29 23:40:45 +02:00
iglocska 3852129f12 new: [CLI] Get the API key of a given user using the CLI 
- simply run /var/www/MISP/app/Console/cake Admin getAuthkey [user_email]
 2018-07-28 09:06:06 +02:00
Alexandre Dulaunoy 33f352e5b2
chg: [PyMISP] updated to the latest version 2018-07-27 18:15:15 +02:00
Alexandre Dulaunoy f3502dbac8
chg: [misp-taxonomies] updated to the latest version 2018-07-27 18:00:28 +02:00
Steve Clement 8aac46a56a
Merge pull request #3515 from SteveClement/2.4 
chg: [i18n] update from crowdin, French (13%) Danish (43%) Italian (25%) Japanese (86%) Korean (2%) Portuguese (6%) Spanish (1%)
 2018-07-27 16:27:36 +02:00
Steve Clement e8546aa58d Merge remote-tracking branch 'upstream/2.4' into 2.4 2018-07-27 16:22:00 +02:00
Steve Clement f5d336491e chg: [i18n] update from crowdin, French (13%) Danish (43%) Italian (25%) Japanese (86%) Korean (2%) Portuguese (6%) Spanish (1%) 2018-07-27 16:14:44 +02:00
iglocska 49c57d5b71 fix: [csv] escaped all string fields to fix some oddities 2018-07-27 15:07:25 +02:00
iglocska 959628a4f8 chg: [csv] added the object_relation field to the CSV export 2018-07-27 14:06:38 +02:00
iglocska acc5023cf5 fix: [upgrade] fixed incorrect upgrade scripts 2018-07-26 17:13:38 +02:00
chrisr3d afb4686cea Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-26 17:10:28 +02:00
chrisr3d 95130663b3
fix: [stix1 export] Removed try catch statements used before depending on the python version 
- Useless now because of python3 forced
 2018-07-26 17:08:23 +02:00
chrisr3d f4ff165e36
fix: [stix1 export] Fixed missing namespace schema location + various code cleaning on framing 2018-07-26 17:05:29 +02:00
chrisr3d ef3c4f6c6c
fix: [stix1 export] Removed not used libraries import on framing 2018-07-26 17:02:14 +02:00
chrisr3d f42fccd92b Merge branch '2.4' of github.com:MISP/MISP into stix2 2018-07-26 12:14:09 +02:00
chrisr3d 5dc761ea7b
chg: [stix2 export] Using the RestResponse view call instead of having view files 2018-07-26 12:10:57 +02:00
Alexandre Dulaunoy 97027ddce0
chg: [misp-taxonomies] updated to the latest version 2018-07-25 18:07:34 +02:00
Alexandre Dulaunoy 8fbfdf5a27
chg: [misp-galaxy] updated to the latest version 2018-07-25 18:06:59 +02:00
Alexandre Dulaunoy 6a512837bd
chg: [misp-objects] updated to the latest version 2018-07-25 18:06:23 +02:00
Alexandre Dulaunoy 50fd01ed73
Merge pull request #3512 from ater49/patch-3 
Update default.po
 2018-07-25 18:04:48 +02:00
ater49 5eb8e81f4a
Update default.po 2018-07-25 17:57:43 +02:00
chrisr3d 394fae9eca Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-25 10:22:55 +02:00
chrisr3d 715da23ab8
fix: [stix2 import] Importing Galaxy Cluster uuid 2018-07-25 10:21:02 +02:00
Andras Iklody e7e8e67acb
Merge pull request #3510 from ater49/patch-1 
Update default.po
 2018-07-25 10:17:26 +02:00
ater49 6ebcea719d
Update default.po 2018-07-25 09:49:32 +02:00
ater49 67b18cdb88
Update default.po 2018-07-25 09:42:30 +02:00
chrisr3d 7d0ca20476 Merge branch '2.4' of github.com:MISP/MISP into stix2 2018-07-25 09:41:20 +02:00
chrisr3d 6ed02c1e46
fix: [stix2 import] Fixed missing field info, forgotten in the latest changes 2018-07-24 18:34:30 +02:00
chrisr3d 5f51511f95
fix: [stix2 import] Skipping relationships atm to avoid errors 
- Relationships parsing to come later
 2018-07-24 18:24:56 +02:00
chrisr3d 233f5774c6
chg: [stix2 import] Preparation for the upcoming changes on stix2 files to import due to the multi export 2018-07-24 14:58:53 +02:00
chrisr3d 4254858d0a Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-24 10:01:55 +02:00
chrisr3d 641d99f362
fix: [stix1 export] Fixed indentation 2018-07-24 10:00:51 +02:00
chrisr3d 38f8ae7557
fix: [stix2 import] Improved file reading in loading function 2018-07-24 09:56:18 +02:00
iglocska c143666485 fix: [cleanup] Cleanup of accidental inclusion of a feature in progress 2018-07-24 06:20:10 +02:00
iglocska 55ef377eee fix: [API] don't allow the same event tag to be added multiple times via an /events/add call, fixes #3507 2018-07-23 23:34:17 +02:00
chrisr3d c416d3b50e
fix: [stix2 export] Fixed monkey issue in org uuid to return (in order to avoid duplication) 2018-07-23 17:06:05 +02:00
chrisr3d 8d4efb538d fix: [stix2 export] Added missing view for stix2 json download 2018-07-23 16:38:56 +02:00
chrisr3d b7a77630dd
chg: [stix2 export] Avoid Orgc Identity object duplication 
- Orgc uuid returned each time a new one is seen
  in an event
- All the uuids as parameter of the python script
- Identity object added only if the current uuid
  is not in the parameters
- References to the corresponding identity are
  (obviously) maintained for the final stix 2.0
  file
 2018-07-23 16:05:36 +02:00
chrisr3d 8c3c54cf49 add: [stix2 export] Added stix2 export view 2018-07-23 12:13:15 +02:00
chrisr3d 03b74d4017
add: [stix2 export] Added instruction about automation part 2018-07-23 11:29:43 +02:00
chrisr3d 8817e0d095
fix: [stix2 export] Fixed event fetching 2018-07-23 09:41:03 +02:00
chrisr3d a208b5208f Merge branch '2.4' of github.com:MISP/MISP into stix2 2018-07-23 09:38:52 +02:00
iglocska ee9d120a76 fix: [data model] Preparation for some taxonomy improvements 2018-07-22 23:28:07 +02:00
chrisr3d 52103d9b64
fix: [stix2 export] Fixed missing variable assignment 2018-07-22 11:56:50 +02:00
Andras Iklody a9e41c8202
fix: [install] Changed the install instructions to use CLI commands... 
...instead of updating config.php. The latter can be dangerous if typos pop-up.
 2018-07-21 22:47:40 +02:00
chrisr3d 53ccf51e71
chg: [stix2 export] Multiple events export prepared in Controller & Model side 
- Changes on automation side coming soon
 2018-07-20 23:59:51 +02:00
iglocska 1930823474 fix: [API] set attribute distribution if it isn't set in the capture attribute call 
- should have worked via the beforevalidate() but it didn't
- ah well
 2018-07-20 16:32:30 +02:00