MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
15,970 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

1505 Commits (0737253d4aa59b780c252dea86a15c9297ce9ca7)

Author SHA1 Message Date
Jakub Onderka 0737253d4a chg: [internal] Distribution is checked by SQL 2020-08-24 16:27:12 +02:00
Jakub Onderka 5232a8d251 chg: [internal] Remove not necessary code 2020-08-24 16:27:01 +02:00
Vito Piserchia 6af706947c syntax check and fix 2020-08-17 19:10:15 +02:00
Vito Piserchia 8486ecb8b4 Merge remote-tracking branch 'upstream/2.4' into baseurl-patch 2020-08-17 17:29:38 +02:00
Vito Piserchia eeb3c3b7d0 rebase continue 2020-08-17 17:19:16 +02:00
Vito Piserchia a393d411e1 rebase continue 2020-08-17 17:13:58 +02:00
Vito Piserchia dad45e68ca rebase continue 2020-08-17 15:52:32 +02:00
Jakub Onderka c41c1d5cc4 chg: [UI] Nicer tag removal confirmation 2020-08-16 16:23:20 +02:00
Vito Piserchia a1c80378f6 more merge fixes 2020-08-16 13:44:53 +02:00
Vito Piserchia b8c7485712 resolve merge 2020-08-16 13:31:31 +02:00
Jakub Onderka 9ba17f2551 fix: [security] Check tag restriction for event tags 2020-08-15 15:48:39 +02:00
Jakub Onderka e4b061c744 fix: [security] Respect ACL for freetext import 2020-08-05 17:37:05 +02:00
Jakub Onderka c749281b8f chg: [UI] Do not exclude local tags when viewing event 2020-08-04 12:23:41 +02:00
Jakub Onderka 67a9d612d5 fix: [security] ACL check when adding or removing tags 2020-08-04 12:23:41 +02:00
Jakub Onderka db626cf741 fix: [security] Respect ACL when event edit 2020-08-04 12:21:42 +02:00
mokaddem 97d63a0989
chg: [event:freetextImport] Usage of primaryOnlyCorrelatingTypes and 
limit the number of correlations displayed
 2020-07-28 11:46:44 +02:00
Jakub Onderka fa222e76f1 chg: [internal] Small controller cleanup 2020-07-27 23:17:45 +02:00
Jakub Onderka 805ce7d728
Merge pull request #5954 from JakubOnderka/get-related-attributes-faster 
chg: [correlations] Faster loading related attributes
 2020-07-26 23:00:42 +02:00
mokaddem 9d0597528d
fix: [events:index] Do not show events if org doesn't belong to the SG 
Event belonging to an organisation which is not
included in the sharing group assigned to the event will not see the
event on the index anymore.
Fix #6033
Fix #6107
 2020-07-21 10:36:15 +02:00
Jakub Onderka 560894c5f5
Merge pull request #6131 from JakubOnderka/toggle-correlation-speedup 
chg: [internal] Faster generating correlations when enabling
 2020-07-20 09:21:18 +02:00
Jakub Onderka b847fd4476 new: [UI] Show event preview when merging 2020-07-20 08:39:51 +02:00
Jakub Onderka 35e2aa5837 chg: [internal] Faster generating correlations when enabling for event by toggle 2020-07-17 09:46:34 +02:00
iglocska 17c46a8b25
fix: [sync] internal sync now correctly syncs local tags 
- also fixes a notice about a missing tag in the sync
 2020-07-16 10:56:32 +02:00
Jakub Onderka dc03e8fd24
Merge pull request #6114 from JakubOnderka/remove-cidr 
fix: [internal] Remove unused CidrComponent and CIDRTool classes
 2020-07-14 12:06:13 +02:00
Jakub Onderka 39f3acba34 fix: [internal] Remove unused CidrComponent and CIDRTool classes 2020-07-14 10:29:32 +02:00
Jakub Onderka 3df94f868f chg: [freetext] Various code fixes and optimisations 2020-07-13 21:12:26 +02:00
Jakub Onderka 9f8a198eaa
Merge pull request #6091 from JakubOnderka/existence-checking 
fix: [internal] Do not check event existence twice
 2020-07-13 17:31:30 +02:00
Andras Iklody e9aa2a284a
Merge pull request #6092 from JakubOnderka/event-ui 
chg: [internal] Simplify and optimise eventUI method
 2020-07-07 11:38:21 +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
Jakub Onderka 7a01fecd14 chg: [internal] Simplify and optimise eventUI method 2020-07-05 16:22:01 +02:00
Jakub Onderka decbb360ea fix: [internal] Do not check event existence twice 2020-07-05 16:03:52 +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
Jakub Onderka e4805fedb8 chg: [correlations] Faster loading related attributes 2020-06-23 12:18:49 +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
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
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