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

10518 Commits (4dd53eb8e3f5c612191a347b32e68594cc2a1472)

Author SHA1 Message Date
iglocska 4dd53eb8e3 fix: [freetext import] Handle cases where a value can be both a hash and a btc address better 2019-01-22 08:58:02 +01:00
iglocska efbe978aa9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-22 08:29:58 +01:00
iglocska 27d048db0c fix: [performance] Potential performance fix for older MySQL versions using the wrong index as key during fetchAttributes() 
- observer a server prioritising the deleted flag index when filtering attributes, leading to a massive performance loss
- hacky solution to make deleted and object_id (during flattening) indeces unusable
 2019-01-22 08:28:15 +01:00
Alexandre Dulaunoy f41ca0b64a
Merge pull request #4033 from andreybolonin/patch-1 
add php 7.3 to travis
 2019-01-21 21:55:07 +01:00
Andrey Bolonin 641769c95e
add php 7.3 to travis 2019-01-21 22:27:58 +02:00
iglocska 17943e2533 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-21 15:15:38 +01:00
iglocska 13993eb1c7 new: [Tag collections] Export/import tag collections added 2019-01-21 15:15:10 +01:00
iglocska 631184a2ca Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-20 22:17:39 +01:00
chrisr3d 43f1c3882b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-20 19:36:04 +01:00
chrisr3d ce325b7ba3
fix: [stix2 export] Fixed event labels fecthing 2019-01-20 19:30:30 +01:00
chrisr3d 20bc1156a4
fix: [stix2 import] Importing TLP Marking definition objects only 
- Following the changes on export script
 2019-01-20 19:12:19 +01:00
iglocska 498a7ae77c new: [feeds] Opened up feed inspection to host org users and added servers to overlap matrix 2019-01-20 10:19:05 +01:00
chrisr3d a49b70a162
fix: [stix2 export] Faster tags handling function 
- Compressed the function, removing some useless
  lines / variables
 2019-01-19 23:09:52 +01:00
chrisr3d ced9145824
fix: [stix2 export] Exporting only TLP tags as MarkingDefinition 
- The other tags are (as before a recent change)
  exported as labels
 2019-01-19 23:07:38 +01:00
iglocska 076cd002c9 chg: [query] Query string bump 2019-01-19 07:04:56 +01:00
iglocska 2f1b8bb9fb fix: [caching] Some minor fixes 2019-01-18 17:02:02 +01:00
iglocska b1d1597468 fix: [ACL] ACL updated 2019-01-18 16:18:23 +01:00
iglocska 8086b9de0a Merge branch 'features/server_caching' into 2.4 2019-01-18 16:16:00 +01:00
iglocska 62f91b4282 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-18 16:15:50 +01:00
iglocska 24146af9db new: [remote caching] First release version of the remote caching 2019-01-18 16:15:22 +01:00
mokaddem a74dcdf202 chg: [tagging] Added more ordering while displaying results 2019-01-18 16:05:25 +01:00
iglocska e1716ac738 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-18 15:54:04 +01:00
mokaddem bfdb33ad21 chg: [Object] Added pre-choice of object meta-category 2019-01-18 15:42:58 +01:00
iglocska eb56fe4e01 chg: [remote cache] Further progress on caching remote instances 2019-01-18 15:33:04 +01:00
mokaddem a18c5d6e4e fix: [AttackMatrix] Stopped comparing string with integer 2019-01-18 15:24:53 +01:00
mokaddem 9357674c1f fix: [generic_picker] avoid having option's name as an array key 2019-01-18 15:03:24 +01:00
mokaddem 2150005e62 fix: [generic_picker] hide div if `empty` is selected 2019-01-18 14:21:24 +01:00
mokaddem c480a666a3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-01-18 14:00:02 +01:00
mokaddem 27e4455116 fix: [tags] picking all tags removed galaxies in the picker 2019-01-18 13:59:33 +01:00
iglocska 7f06ed3c76 fix: [tag collections] Adding tags to tag collections fixed 2019-01-18 13:35:53 +01:00
iglocska 7ce41ec4f6 fix: [ACL] small ACL fix 2019-01-18 11:59:24 +01:00
iglocska 55abc9ed70 chg: [refactor] Slight refactor for getAttributesTags() 2019-01-18 11:58:54 +01:00
iglocska 5a797827d0 fix: [Tag collections] Fix case of several tag IDs being passed 2019-01-18 11:57:38 +01:00
iglocska 2e961ba706 fix: [ACL] Restrict tag collection modification to tag editors 2019-01-18 11:57:04 +01:00
iglocska 32cc726006 chg: [cleanup] Removal of duplicate code 2019-01-18 11:56:36 +01:00
mokaddem bf923220cd Merge branch 'UISelector' into 2.4 2019-01-18 10:02:49 +01:00
mokaddem 2c79966448 fix: [Unpublish] variable not set when not in event context (i.e. 
revise_object)
 2019-01-18 09:47:33 +01:00
mokaddem 3d69620148 chg: [generic_popover] Pressing <ESC> destroy the popover 2019-01-18 09:29:34 +01:00
mokaddem 593f58ad09 fix: Added some more escaping 2019-01-18 09:29:18 +01:00
iglocska 9c5fbdd7e9 new: [server caching] Initial version WIP 2019-01-18 09:06:23 +01:00
Steve Clement bfdd40cfed
Merge pull request #4028 from SteveClement/guides 
Guides
 2019-01-18 15:30:35 +09:00
Steve Clement 3de97a22d8 chg: [doc] Updated date of testing. 2019-01-18 15:28:08 +09:00
Steve Clement 1939bb22e7 chg: [doc] Updated Ubuntu 18.04 install and all generic generic dependencies. 2019-01-18 15:26:07 +09:00
mokaddem e2faa2c53e fix: [UI] prevent failing if generic_picker is not in a popover 2019-01-17 16:27:51 +01:00
mokaddem 4859518ce3 fix: [JS] switch to local variable 2019-01-17 15:53:13 +01:00
mokaddem 5e6dc0524f fix: [App] Bump queryVersion 2019-01-17 15:48:52 +01:00
mokaddem aef04415f8 chg: [Taxonomy] disable (hide) tags when disabling parent taxonomy 2019-01-17 15:46:40 +01:00
mokaddem 365dbfd2c6 chg: Fixed LGTM JavaScript analysis alerts 2019-01-17 15:20:10 +01:00
iglocska a9a47fb46c new: [cache export] Added the includeEventUuid flag to the output 2019-01-17 15:04:01 +01:00
mokaddem 8a710ea367 Merge branch '2.4' into UISelector 2019-01-17 14:54:15 +01:00