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

1487 Commits (1c4b3b97e9afc5b74ad42ade6c77035ea159fd01)

Author SHA1 Message Date
mokaddem 1c4b3b97e9
chg: Removed integer type hinting in controllers 2020-07-07 14:49:09 +02:00
mokaddem ac44422b04
chg: Added comments 2020-07-07 10:37:31 +02:00
mokaddem 51337c230e
chg: refacto some galaxy cluster controller files 2020-07-07 09:46:47 +02:00
mokaddem 38da0d2461
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-07 07:39:43 +02:00
iglocska c81c47d01a
new: [merge] functionality reworked 
- handle objects, tags, etc via @chrisr3d's module result parsing
- handle sharing groups correctly - as reported by Jakub Onderka
- using standardised fetchers internally
- API enabled (which will directly merge all contents of the source event into the target event)
 2020-07-06 16:43:18 +02:00
mokaddem f3a9481c61
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-01 16:22:55 +02:00
Jakub Onderka b0be3b07fe fix: [security] Check event ACL before allowing user to send event contact form 2020-06-30 09:01:55 +02:00
iglocska 6b95047c1e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-06-22 11:11:31 +02:00
iglocska 2eccb31636
fix: [ACL] unpublished_private global setting tightened to include correlations 
- Thanks to Jakub Onderka for reporting and providing a fix to this!
 2020-06-22 11:10:25 +02:00
mokaddem 5c04b9a8c1
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-05-28 14:06:30 +02:00
chrisr3d e95dad15d0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-25 12:00:33 +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
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
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
chrisr3d 89c590edc0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-20 01:18:46 +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 59e635c974 fix: [internal] Remove duplicate code that cause error in PHP 7.4 2020-05-19 17:37:41 +02:00
chrisr3d 285cc2dea0 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-18 11:05:52 +02:00
Golbark c244c5c21a fix: allow_disabling_correlation not taken into account 2020-05-15 09:05:50 +02:00
mokaddem 3bc2b2c50a
chg: [clusterRelations:networkGenerator] Moved function in `Lib/Tools` 2020-05-12 10:29:52 +02:00
mokaddem 36e1e37469
fix: [events:view] Fixed cluster_relations filename and distribution 
info
 2020-05-12 10:08:13 +02:00
mokaddem abac1f5d84
chg: [events:relations_graph] Added Referencing Clusters 2020-05-11 16:55:18 +02:00
mokaddem 3acf2bd4cf
chg: [clusterRelations:networkGraphs] Improved UI by highlighting root 
nodes
 2020-05-11 15:14:29 +02:00
mokaddem 089081a77d
new: [events:view] Added Cluster relationship network graph 2020-05-11 11:32:45 +02:00
chrisr3d 5e83761f83 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-07 11:47:55 +02:00
Steve Clement 833af7c114
Merge pull request #5207 from JakubOnderka/patch-33 
fix: [internal] Just site admin can force when saving freetext
 2020-04-30 18:21:04 +09:00
mokaddem 8525dda7f8
Merge remote-tracking branch 'origin/2.4' into eventTimeline-sightings 2020-04-30 08:38:39 +02:00
chrisr3d 6adc0f2777 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-28 17:56:36 +02:00
mokaddem 94bf826841
Merge remote-tracking branch 'origin/2.4' into JakubOnderka-event_loading_speedup 2020-04-28 11:39:51 +02:00
mokaddem 2ad846fbfb
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-28 10:01:19 +02:00
mokaddem ffad8d9189
chg: [events:view] Support of `extended` for posted data 2020-04-28 10:00:36 +02:00
Christophe Vandeplas 5495140c3b
fix: [event] fixes missing correlations with combined types (#5832) 
* fix: [event] fixes missing correlations with combined types

also some other missing variable bug
 2020-04-28 10:00:09 +02:00
Jakub Onderka f0ada41963 chg: [internal] Speed up of loading event page 2020-04-27 16:00:28 +02:00
mokaddem 93bd5eddba
chg: [event:timeline] Added Sightings visualisation 2020-04-23 10:08:34 +02:00
chrisr3d 4ffb45eafc Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-16 17:55:31 +02:00
iglocska 7991016039
fix: [API] event index queries refactored 
- fixed ID lookups to be more graceful (IN() instead of OR-d statements)
- removed default sorting which is the default anyway but introduces a massive overhead
 2020-04-14 18:00:43 +02:00
mokaddem dd1be03597
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-04-09 14:26:48 +02:00
chrisr3d 3ec127bcbe Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-08 16:44:03 +02:00
mokaddem d5f5552d91
chg: [events:exports] Migrated majority of export type to use restSearch 2020-04-06 11:49:39 +02:00
mokaddem 0d7199cb08
fix: [events:export-csv] Default to_ids to be 1 2020-04-06 10:14:45 +02:00
chrisr3d 8163857417 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-04-03 14:56:19 +02:00
iglocska f028313029
fix: [event index] org filter correctly accepts array in addition to pipe delimited values 
- fixes pull org filters
 2020-03-30 08:56:30 +02:00
mokaddem 04dcdebb1f
new: [galaxyCluster] Initial import of Galaxy2.0 codebase - WiP 2020-03-12 10:26:09 +01:00
chrisr3d 8e199ccc32 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-28 22:51:21 +01:00
Steve Clement 5660467f84
fix: [i18n] Various edits and small __('') addeage. 2020-02-27 10:43:04 +09:00
chrisr3d 5ab8a18d11 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-26 17:12:48 +01:00
iglocska aaafd95c74
fix: [sync] allow for both the minimal and searchminimal keywords to be used on the event index 
- until now due to a bug only searchminimal was used
- sync negotiation uses minimal as the key
- this should greatly speed up the negotiation phase
 2020-02-25 16:48:05 +01:00
chrisr3d 50d0fa1011 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-02-14 20:30:02 +01:00
Jakub Onderka 3770886bb8
fix: [internal] Remove unused function 2020-02-13 15:57:58 +01:00