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

15306 Commits (e95dad15d06601be008bafe047f30c909bc49545)

Author SHA1 Message Date
chrisr3d e95dad15d0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-25 12:00:33 +02:00
chrisr3d fb78b721dc
fix: [stix2 export] Making sure we have the required name field set while exporting regkey values from a MISP regkey object to a STIX observed data 2020-05-25 11:58:58 +02:00
chrisr3d 02ef309d0b
fix: [stix2 export] Fixed regkey|value expor 
- Revert to the initial mapping that has been
  changed to the wrong field: the value should be
  mapped to the data field and instead of name
 2020-05-25 11:49:46 +02:00
Steve Clement 5d7244741f
Merge pull request #5938 from SteveClement/guides 2020-05-25 14:58:24 +09:00
Steve Clement e9ba131596
chg: [doc] Updates to OpenBSD Install (which fails ATM) 2020-05-25 14:46:16 +09:00
Steve Clement 8916ea948f
Merge pull request #5937 from SteveClement/guides 2020-05-25 08:49:54 +09:00
Steve Clement d799bcf8cb
chg: [doc] Variable updates 2020-05-25 08:47:49 +09:00
Steve Clement f851128861
chg: [doc] Reshuffled docs 2020-05-25 07:55:21 +09:00
Steve Clement 38344be3fa
chg: [doc] Update to OpenBSD 6.7 2020-05-24 21:56:07 +09:00
Andras Iklody 2b6ba33618
Merge pull request #5936 from JakubOnderka/php74-errors 
fix: [internal] Notices in PHP 7.4 for login page
 2020-05-24 10:56:29 +02:00
Andras Iklody cb5e55e30c
Merge pull request #5935 from JakubOnderka/patch-106 
fix: [UI] Bootstrap 2 doesn't support auto position for popover
 2020-05-24 10:55:46 +02:00
Jakub Onderka 3249821134 fix: [internal] Notices in PHP 7.4 for login page 2020-05-24 09:59:46 +02:00
Jakub Onderka 10f0b213b2
fix: [UI] Bootstrap 2 doesn't support auto position for popover 2020-05-23 21:27:09 +02:00
Andras Iklody 0db582ef95
Merge pull request #5924 from JakubOnderka/php74-errors 
Fix notices in PHP 7.4
 2020-05-23 18:27:19 +02:00
iglocska f46ec87cc0
chg: [cakephp] bump 
- updates cakephp to include the UUID generation fix by @RichieB2B to solve the deficiency discovered by @JakubOnderka. You guys rock.
 2020-05-23 18:24:43 +02:00
Andras Iklody 0fa4c7aecb
Merge pull request #5934 from JakubOnderka/remove-galaxy-tags 
chg: [internal] Faster removing galaxy cluster tags from attributes
 2020-05-23 17:59:45 +02:00
Andras Iklody ee27ee5026
Merge pull request #5933 from JakubOnderka/patch-105 
chg: [UI] Nicer icon for form info
 2020-05-23 17:59:09 +02:00
Jakub Onderka 15767eae0d chg: [internal] Faster removing galaxy cluster tags from attributes 2020-05-23 17:30:00 +02:00
Jakub Onderka 20b1a30647 fix: [internal] Fix notice in PHP7.4 when loading events attrs by ajax 2020-05-23 17:16:30 +02:00
Jakub Onderka 09ffbc52c7 chg: [UI] Nicer icon for form info 2020-05-23 16:52:35 +02:00
Alexandre Dulaunoy 6c6f6454c0
chg: [misp-galaxy] updated to the latest version 2020-05-23 10:15:08 +02:00
chrisr3d 634dc66434 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-23 05:24:08 +02:00
chrisr3d 36c7caa87c
chg: [stix2 export] Moved the Attributes parsing functions into the main script 
- Also checked the mapping to find potential bugs,
  and fixed/updated some fields (in observed-data
  and indicators)
 2020-05-23 05:21:01 +02:00
chrisr3d 1754e3e500
wip: [stix2 export] Moved dictionaries in the mapping file & using the complete import path instead of import * from the mapping file 
- We control and know which mapping dictionary we
  call and that they come from the mapping script
- Started moving all the mapping dictionaries in
  the mapping file
- Attributes parsing function will be moved into
  the main script
 2020-05-23 05:15:18 +02:00
Sami Mokaddem 964ba7ca8b
fix: [documentation] Typo with the CLI function name. Fix #5931 2020-05-22 14:38:46 +02:00
Steve Clement ec8ab2e23d
chg: [installer] Updated to latest Installer 2020-05-22 16:25:33 +09:00
Steve Clement 79f0c059c7
Merge pull request #5930 from SteveClement/guides 2020-05-22 16:25:01 +09:00
Steve Clement 3504c1a0ed
chg: [var] Wrapped vars {} - Made loops around git clones (for ctrl-c resumeability) 2020-05-22 16:18:07 +09:00
Andras Iklody 150b66da2f
Merge pull request #5928 from JakubOnderka/patch-104 
fix: [UI] Do not show Good-Bye when using custom logout
 2020-05-21 23:31:40 +02:00
Alexandre Dulaunoy cbdabb0f46
Merge pull request #5925 from JakubOnderka/patch-102 
fix: [UI] Galaxy cluster links should be clickable
 2020-05-21 19:09:39 +02:00
Jakub Onderka 77e34ba41c
fix: [UI] Do not show Good-Bye when using custom logout 
Becuse without this patch, Good-Bye is show when user successfully log in.
 2020-05-21 17:10:28 +02:00
chrisr3d 96e8aa68d7
fix: [stix2 export] Removed unused mapping dictionary fields 2020-05-20 18:19:53 +02:00
chrisr3d 89c590edc0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-20 01:18:46 +02:00
chrisr3d d53d3bfb52
chg: [stix2 import] Observable single attributes parsing functions are now in the main script 
- Also update of the mapping dictionary with the
  latest updated functions moved from the mapping
  script to the main script
 2020-05-20 01:16:50 +02:00
chrisr3d 29245f7338
fix: [stix2 export] Removed object attributes added in file patterns for test purposes 2020-05-20 01:13:28 +02:00
chrisr3d 857d0dffa3
wip: [stix2 import] Moving small parsing functions to the main script 
- Also passing the function names only instead of
  storing functions themselves in the dictionary
 2020-05-19 23:55:39 +02:00
Andras Iklody 3274778d35
Merge pull request #5926 from JakubOnderka/patch-103 
new: [UI] Add event ID to page table
 2020-05-19 22:55:56 +02:00
Jakub Onderka e9dc6e36f4
new: [UI] Add event ID to page table 
With more tabs, navigation between tabs with different events can be pain, when all of them has the same title.
 2020-05-19 21:20:31 +02:00
Jakub Onderka ed865cee73
fix: [UI] Galaxy cluster links should be clickable 2020-05-19 21:07:52 +02:00
Jakub Onderka ec92a97982 fix: [internal] Branch setting don't have level value 2020-05-19 17:43:18 +02:00
Jakub Onderka 59e635c974 fix: [internal] Remove duplicate code that cause error in PHP 7.4 2020-05-19 17:37:41 +02:00
Jakub Onderka 8c13330712 fix: [internal] Check if user is logged before checking if he is site admin 2020-05-19 17:11:39 +02:00
Jakub Onderka df1ed1badf fix: [internal] Set notifications count and loggedInUserName just for logged users 2020-05-19 17:10:53 +02:00
iglocska 8037056eb4
chg: [galaxy] bump 2020-05-19 16:51:13 +02:00
Alexandre Dulaunoy 04f712f899
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-05-19 16:30:20 +02:00
Alexandre Dulaunoy d16db7d687
chg: [warning-lists] updated to the latest version 2020-05-19 16:29:35 +02:00
chrisr3d d0ff0f66f5
fix: [stix2 export] Removed object attributes added for test purposes 2020-05-19 13:51:42 +02:00
chrisr3d eecc7b2573
chg: [stixtest] JQing MISP event result from a STIX import for more visual ease 2020-05-19 02:23:59 +02:00
chrisr3d a7d5697687 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-18 17:06:34 +02:00
chrisr3d d6b9d5d009
fix: [stix2 import] Writing import results as expected in the result file 2020-05-18 17:05:30 +02:00