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

14047 Commits (53482ff76c409d0ebf944853fdae4d8483a5b6f7)

Author SHA1 Message Date
iglocska 53482ff76c
Merge branch 'sqlIndexDiagnostic' into 2.4 2019-12-19 10:33:00 +01:00
iglocska 3fc02548f6
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-19 09:28:34 +01:00
iglocska 6756badac8
fix: [internal] fixed newly introduced error with full_group_by directive when adding galaxies to tag collections 2019-12-19 09:27:44 +01:00
Andras Iklody b15cccc476
Merge pull request #5473 from airbus-cert/Fix_PHP_composer_hash 
Wrong hash composer-setup.php
 2019-12-19 09:09:09 +01:00
iglocska 8a96ab1270
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-18 17:43:22 +01:00
iglocska 592f2be638
fix: [internal] avoid loading outdated versions of galaxies 2019-12-18 17:40:00 +01:00
Amaury Leroy 15cda006a1 Fix composer-setup.php hash 2019-12-18 17:30:33 +01:00
Amaury Leroy 7feea0db60 Fix composer-setup.php hash 2019-12-18 17:29:57 +01:00
Amaury Leroy dfaae45902 Fix composer-setup.php hash 2019-12-18 17:29:47 +01:00
Amaury Leroy 1ac1b89854 Fix composer-setup.php hash 2019-12-18 17:29:32 +01:00
Amaury Leroy 18de54248a Fix composer-setup.php hash 2019-12-18 17:29:27 +01:00
Amaury Leroy c8a687fc0f Fix composer-setup.php hash 2019-12-18 17:29:13 +01:00
Amaury Leroy bd2e0d920d Fix composer-setup.php hash 2019-12-18 17:29:07 +01:00
devnull- 88500af09f
Merge pull request #1 from MISP/2.4 
Update fork
 2019-12-18 17:10:12 +01:00
mokaddem 8f6cdc73e1
fix: [diagnostic:DBIndexes] Typo keyname 2019-12-18 16:32:39 +01:00
mokaddem d9bb0b509e
chg: [diagnostic:DBIndexes] Hide notice message if index diagnostic not 
shown
 2019-12-18 16:23:27 +01:00
mokaddem 7be275aced
chg: [diagnostic:DBIndexes] Cleanup, bug fix and updated db_schema 2019-12-18 16:21:13 +01:00
mokaddem 637e2806ef
new: [diagnostic:DBIndexes] Added complete diagnostic for database 
indexes
 2019-12-18 15:53:20 +01:00
Raphaël Vinot 235e5a0562 chg: Bump PyMISP 2019-12-18 15:39:51 +01:00
iglocska b6346ad473
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-18 15:09:24 +01:00
iglocska eb50b68708
fix: [UI] adding attack-like galaxy clusters to tag collections was slow 
- was generating a heatmap out of all event metadata each time for no good reason
 2019-12-18 15:07:41 +01:00
Alexandre Dulaunoy afc312f301
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-17 15:00:44 +01:00
Alexandre Dulaunoy 105115af5d
chg: [misp-objects] updated to the latest version 2019-12-17 15:00:18 +01:00
mokaddem 0400fa0370
new: [diagnostic:DBIndex] Show table columns having indexes 2019-12-17 10:54:45 +01:00
Raphaël Vinot 6570249b1b chg: Bump PyMISP, again 2019-12-16 15:37:55 +01:00
Raphaël Vinot 266effae8e chg: Bump PyMISP 2019-12-16 15:24:41 +01:00
Andras Iklody 9454b458ee
Merge pull request #5459 from mokaddem/schemaDiagnosticImprovement 
Schema diagnostic improvement
 2019-12-16 14:14:41 +01:00
Andras Iklody 4eb83ec245
Merge pull request #5341 from JakubOnderka/patch-68 
chg: [internal] Faster loading list of attributes
 2019-12-16 14:13:20 +01:00
Andras Iklody 5bb6fde4b2
Merge pull request #5463 from zaphodef/feature/selective_import_objects 
chg: new feature to selectively choose to import objects (or not)
 2019-12-16 13:58:48 +01:00
Andras Iklody 45d88bb9ef
Merge pull request #5464 from zaphodef/fix/empty_error_panel 
fix: Don't show an empty error when there is no error
 2019-12-16 13:57:36 +01:00
Raphaël Vinot 1e8948af1d chg: Bump PyMISP 2019-12-16 13:50:54 +01:00
iglocska 34f1031188
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-16 13:20:59 +01:00
iglocska 0d3e4dbf46
fix: [CLI] updateObjectTemplates handles fetching the user correctly now 2019-12-16 13:20:19 +01:00
Raphaël Vinot 7fea684800 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-16 12:46:54 +01:00
Raphaël Vinot 532c077b7e fix: updateObjectTemplates with user ID 1 2019-12-16 12:46:44 +01:00
Sami Mokaddem 2be36fb611
chg: [Console:admin] Allow `travis` user to bring the database up to date 2019-12-16 12:46:37 +01:00
Alexandre Dulaunoy cf8d296f31
chg: [misp-galaxy] updated to the latest version 2019-12-16 11:38:53 +01:00
Raphaël Vinot 40bb1c2323 chg: Update object templates on travis 2019-12-16 11:34:29 +01:00
chrisr3d db13f2ac07
fix: [stix import] Storing methods names in the mapping dictionary so we do not store the methods themselves 2019-12-16 07:56:22 +01:00
chrisr3d 9f528f6575
fix: [stix export] Storing methods names in the mapping dictionary so we do not store the methods themselves 2019-12-16 07:55:16 +01:00
chrisr3d 6ed75e4356
fix: [stix2 export] Storing methods names in the mapping dictionary so we do not store the methods themselves 2019-12-16 07:46:54 +01:00
chrisr3d 8ee4c83283
fix: [stix2 import] Storing methods names and calling them with getattr instead of storing the methods themselves 2019-12-15 16:41:39 +01:00
chrisr3d 832a5fb6ab
fix: [stix2 import] Fixed import of observables with no marking attached 2019-12-14 15:30:57 +01:00
chrisr3d dcebfac103 Merge branch 'add_attribute' of https://github.com/MISP/MISP into 2.4 2019-12-13 11:18:23 +01:00
chrisr3d d2c9c2fa0f
fix: [stix2 import] Avoid issues with relationships list when there is no relationship object in the stix file we want to import 2019-12-13 11:04:39 +01:00
chrisr3d ef149fc3fc Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-12-13 10:13:38 +01:00
iglocska 1672e583e3
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-12 17:10:51 +01:00
iglocska d65b0333fb
fix: [cleanup] removed wtf inducing debug message 2019-12-12 17:10:23 +01:00
Pierre-Jean Grenier e934eede67 fix: Don't show an empty error when there is no error 2019-12-12 17:06:53 +01:00
Pierre-Jean Grenier 40cf190119 chg: new feature to selectively choose to import objects (or not) 2019-12-12 15:24:20 +01:00