MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
8,925 Commits
58 Branches
373 Tags
196 MiB
Commit Graph

8925 Commits (b99adf5d761b78c4bc1b3eaf9875243a09c01ad9)

Author SHA1 Message Date
iglocska b99adf5d76 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-20 09:42:06 +02:00
iglocska 58997b9ac1 chg: [psr-2] Changed view files to space indentation instead of tabs 
- *sniff sniff*
 2018-07-20 09:29:50 +02:00
Andras Iklody 950c71c183
Merge pull request #3502 from SteveClement/2.4 
chg: [form] Give change Password field focus.
 2018-07-19 14:50:09 +02:00
Steve Clement a7bab30867 chg: [form] Give change Password field focus. 2018-07-19 14:41:57 +02:00
iglocska a81894f14c chg: [CS] Changed to PSR-2 
- to make contributions easier, adopted PSR-2
- used php-cs-fixer to rework the style
- *sniff sniff* Goodbye tab indentation
 2018-07-19 11:48:22 +02:00
iglocska a644505309 fix: [delegation] Attribute tags and objects were not transfered during delegation, fixes #3495 
- The delegation system hasn't been updated since the introduction to the new systems
- new objects being transferred: objects, attribute tags, object references
 2018-07-19 09:51:23 +02:00
Alexandre Dulaunoy 9ce92f264c
chg: [misp-objects] updated to the latest version 2018-07-18 22:09:14 +02:00
Alexandre Dulaunoy 98fa34be54
chg: [misp-taxonomies] updated to the latest version 2018-07-18 22:08:35 +02:00
chrisr3d 97c87c4a2b
fix: [stix2 import] Fixed relationship import 
- Skipping it at the moment
- Will have to rebuild a large part of the import
  functions to include relationships after the export
  part is reworked completely
 2018-07-18 16:49:13 +02:00
chrisr3d d5d4fa8f9b
fix: [stix2 import] Fixed vulnerability import, following the last changes on export part 2018-07-18 16:48:13 +02:00
chrisr3d 2bf3c86970
fix: [stix2 export] Fixed vulnerability export 
- depending on the origin of the object exported:
  attribute/object or galaxy
 2018-07-18 16:45:51 +02:00
chrisr3d b484c59de4 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-18 16:05:21 +02:00
chrisr3d 634b5c200a
add: [stix2 export] Added relationships between SDOs 
- Mostly relationships defined by the official
  STIX2.0 Relationships Mapping
- Further changes on relationships to come
 2018-07-18 16:02:03 +02:00
chrisr3d cfd27d6ff3
fix: [stix2 export] Fixed relationships mapping typo 2018-07-18 15:59:43 +02:00
iglocska d91c85998b fix: [bug] Fixed an invalid count() call on the taxonomies index 2018-07-18 14:31:54 +02:00
Steve Clement 65816f271e
Merge pull request #3500 from SteveClement/2.4 
chg: [i18n] update default.pot to include all new strings
 2018-07-18 13:52:33 +02:00
Steve Clement 12a9c0d9b6 chg: [i18n] update default.pot to include all new strings. Updated cze/fra/ita/jpn/kor/PT_br 
new: [i18n] Spanish translation file
 2018-07-18 13:49:50 +02:00
chrisr3d 71ecacb5dd
fix: [stix2 export] Watching if a cluster uuid has already been added to be exported instead of a galaxy uuid 2018-07-18 12:55:19 +02:00
Steve Clement 7d98cd8102
Merge pull request #3499 from SteveClement/2.4 
fix: [i18n] Made PO importable into crowdin.
 2018-07-18 11:14:16 +02:00
Steve Clement ec14520be8 fix: [i18n] Made PO importable into crowdin. 2018-07-18 11:12:32 +02:00
chrisr3d 5903de7eb4
fix: [stix2 export] Allowed custom properties for all Indicators/ObservedData from MISP objects export 2018-07-18 10:52:39 +02:00
chrisr3d 5e9060bde2
fix: [stix2 export] Fixed regkey|value attribute export 2018-07-18 10:45:32 +02:00
chrisr3d c78d42fa53
fix: [stix2 export] Exporting not mapped attributes of regkey objects as custom properties 2018-07-18 10:36:36 +02:00
chrisr3d f12514e925
chg: [stix2 export] Updated Galaxies parsing 2018-07-18 10:23:34 +02:00
Andras Iklody 828d78e30c
Merge pull request #3498 from eCrimeLabs/2.4 
Fix related to Concerns PR #3492
 2018-07-17 23:58:11 +02:00
Dennis Rand 7e7c238ff1 Fix related to Concerns PR #3492 2018-07-17 20:39:18 +00:00
Steve Clement 4e8dfd49d4
Merge pull request #3493 from SteveClement/guides 
chg: [kali] small typo in git config
 2018-07-17 15:31:19 +02:00
Steve Clement 1670c858cd chg: [kali] small typo in git config 2018-07-17 14:42:26 +02:00
chrisr3d d052cde698 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-17 09:57:13 +02:00
chrisr3d 43c3912ad2
chg: [stix2 import] Importing pe object custom properties 
- Following the last changes on stix2 export
 2018-07-17 09:55:51 +02:00
Andras Iklody 500e29404f
Merge pull request #3492 from eCrimeLabs/2.4 
Danish translation attempt. It does miss some changes but it should b…
 2018-07-17 07:12:51 +02:00
iglocska fc03a21ef7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-17 07:06:52 +02:00
iglocska 064f266159 fix: [API] Attribute edit via uuid fails as non site admin, fixes #3487 2018-07-17 07:04:46 +02:00
Dennis Rand f8566fcc64 Danish translation attempt. It does miss some changes but it should be a good start 2018-07-16 17:58:13 +00:00
chrisr3d 9826f8857c
chg: [stix2 export] Exporting not mapped attributes from pe objects as custom properties 2018-07-16 18:43:56 +02:00
chrisr3d 1fbff8c1ec Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-16 17:21:51 +02:00
Steve Clement d5f8960ba4
Merge pull request #3490 from SteveClement/guides 
chg: [kali] redis on boot (for persistent setups)
 2018-07-16 15:44:04 +02:00
Steve Clement c77f05cfd8 chg: [kali] redis on boot (for persistent setups) 2018-07-16 15:43:20 +02:00
chrisr3d 24dc94832f
chg: [stix2 export] Updated galaxy types parsing (improvement + types added) 2018-07-16 15:28:17 +02:00
chrisr3d 38ac7d0583
chg: [stix2 export] Parsing Galaxies in attributes level 2018-07-16 15:25:05 +02:00
Steve Clement 2d44e7f1dd
Merge pull request #3489 from SteveClement/guides 
chg: [kali] added headers to vhost. More automation in rc.local
 2018-07-16 14:49:27 +02:00
Steve Clement b3a63037ee chg: [kali] added headers to vhost. More automation in rc.local 2018-07-16 14:48:54 +02:00
Steve Clement ad03d0cde1
Merge pull request #3488 from SteveClement/guides 
chg: [doc] Various updates to Debian and Kali Linux install files.
 2018-07-16 14:36:47 +02:00
Steve Clement c2a8a9e4d1 chg: [kali] added expect to make it work on kali-light 2018-07-16 14:35:05 +02:00
Steve Clement 4ec341081b Merge branch '2.4' into guides 2018-07-16 14:06:42 +02:00
Andras Iklody 9d27ae906b
Merge pull request #3486 from mokaddem/fix-eventGraphDBUpdate 
Fix event graph db update
 2018-07-16 12:37:48 +02:00
Sami Mokaddem 06cc7f5a2c fix: [AppModel] re-apply the eventGraph SQL query 2018-07-16 10:03:58 +00:00
Sami Mokaddem 7242c576f1 fix: [AppModel] added missing comma in SQL update query 2018-07-16 09:48:05 +00:00
Sami Mokaddem d5a04b67f1 fix: [eventGraph] export now works on firefox 2018-07-16 09:01:20 +00:00
Andras Iklody b0892a6fd5
Merge pull request #3483 from SteveClement/2.4 
chg: [i18n] Added a lot of __('s for our i18n effort
 2018-07-16 00:41:43 +02:00