MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
16,734 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

16734 Commits (36e070ca704b1a3b23926f7f6536940596f281dd)

Author SHA1 Message Date
chrisr3d 36e070ca70
fix: [tools] Variable names typo 2020-10-19 11:40:16 +02:00
chrisr3d 3b27232974 Merge branch 'chrisr3d_features' of https://github.com/MISP/MISP into chrisr3d_features 2020-10-19 11:27:06 +02:00
chrisr3d 0d65e00511 Merge branch '2.4' of https://github.com/MISP/MISP into chrisr3d_features 2020-10-19 11:24:56 +02:00
Jakub Onderka 396dedfcfa
Merge pull request #6459 from JakubOnderka/composer-update 
chg: [internal] Update composer.phar to 1.10.15
 2020-10-19 09:32:48 +02:00
Jakub Onderka d95da921ac chg: [internal] Add suggested PHP extensions to composer.json 2020-10-19 09:17:01 +02:00
Jakub Onderka 1ccfaac0a9 chg: [internal] Update composer.phar to 1.10.15 2020-10-19 09:06:33 +02:00
Jakub Onderka 361ba31a50
Merge pull request #6458 from JakubOnderka/remove-unused 
Remove unused code
 2020-10-18 22:43:02 +02:00
Jakub Onderka a8cd412729 fix: [internal] Unused variable in Event::__generateCachedTagFilters 2020-10-18 22:22:59 +02:00
Jakub Onderka cb9f66e973 fix [internal] Removed unused EventsController::viewEventGraph method 2020-10-18 22:22:10 +02:00
Jakub Onderka 0eee4efb38 fix [internal] Removed unused Server::__handlePulledProposals method 2020-10-18 22:21:38 +02:00
Jakub Onderka 014ad0ef61 fix [internal] Removed unused EventsController::__fetchEvent method 2020-10-18 22:20:42 +02:00
Jakub Onderka 8062af8fd1 fix: [internal] Remove unused file 2020-10-18 22:19:45 +02:00
Jakub Onderka ac6761d7a5 fix: [internal] Remove unused AppModel::checkVersionRequirements method 2020-10-18 22:19:07 +02:00
Jakub Onderka f6635b833e
Merge pull request #6454 from JakubOnderka/travis-fixes-vol3 
test: Retry poetry install
 2020-10-18 22:15:04 +02:00
Jakub Onderka cb5f501580 fix: [travis] Retry poetry packages installation 2020-10-18 21:40:18 +02:00
Jakub Onderka 61928bf96c
Merge pull request #6457 from JakubOnderka/rest-response-optim 
chg: [internal] Save some time and memory in RestResponseComponent
 2020-10-18 18:52:22 +02:00
Jakub Onderka 9be3437851 chg: [internal] Save same time and memory in RestResponseComponent 2020-10-18 17:08:39 +02:00
Jakub Onderka 011ca69b51
Merge pull request #6455 from JakubOnderka/resolved-misp-format-value 
chg: [UI] Use standard way how to show attribute values for resolved …
 2020-10-18 12:12:40 +02:00
Jakub Onderka 8b8ccc815b
Merge pull request #6456 from JakubOnderka/admin-user-view-fixes 
chg: [UI] Fixes for user profile admin view
 2020-10-17 21:48:15 +02:00
Jakub Onderka 16a29544e9 chg: [UI] Fixes for user profile admin view 2020-10-17 16:47:07 +02:00
Jakub Onderka 799f8bfb45 chg: [UI] Use standard way how to show attribute values for resolved results 2020-10-17 16:29:34 +02:00
Jakub Onderka a6ffb380f7 chg: [travis] Do list all directories after failed test 2020-10-17 12:36:26 +02:00
Christian Studer 75f62abae1
Update README.md 
Page layout issue fixed
 2020-10-17 00:16:09 +02:00
chrisr3d 4d05a981d4
add: [tools] More documentation for the stix ingestion script 2020-10-17 00:07:09 +02:00
chrisr3d efb81b5425
add: [tools] Small script to ingest STIX files using the restAPI 
- Automation of the ingestion for multiple file
  simply by passing all the filenames
- Using PyMISP to connect to MISP and query the
  /events/upload_stix end point
 2020-10-16 23:46:57 +02:00
iglocska e89b14b084
chg: [VERSION] bump 2020-10-16 15:05:28 +02:00
iglocska 0415561a2e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-10-16 14:42:04 +02:00
iglocska 42aaea20f8
fix: [server] caching notice fixed 2020-10-16 14:41:45 +02:00
Raphaël Vinot e14192ccf6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-10-16 13:18:16 +02:00
Raphaël Vinot 5527c24d92 chg: Bump PyMISP 2020-10-16 13:17:04 +02:00
iglocska a14e787e17
Merge branch 'tagfix' into 2.4 2020-10-16 12:47:59 +02:00
iglocska cc78b0185a
Merge branch '2.4' of github.com:MISP/MISP into HEAD 2020-10-16 12:46:57 +02:00
iglocska 039721aa6a
fix: [attribute tag culling] fixed 
- no longer hides tags that should be included in the export
 2020-10-16 12:46:06 +02:00
Alexandre Dulaunoy a470293cad
chg: [warning-lists] updated 2020-10-16 12:40:17 +02:00
Alexandre Dulaunoy d8690a401b
chg: [misp-objects] updated to the latest version 2020-10-16 12:39:40 +02:00
mokaddem 6a02ae81c9
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-10-16 09:50:38 +02:00
mokaddem 529ee3622e
Merge branch '2.4' into event-report-optimisations 2020-10-16 09:49:43 +02:00
Jakub Onderka e9a13638ae
Merge pull request #6414 from JakubOnderka/user-view-ui 
Flag icons and country list
 2020-10-16 09:37:30 +02:00
Jakub Onderka c4153b1a0c chg: [UI] Remove famfamfam icon flags 2020-10-16 09:21:26 +02:00
Jakub Onderka 119de231b5 new: [UI] Use flag icons from Twemoji 2020-10-16 09:21:26 +02:00
Jakub Onderka 8ab97c074b chg: [UI] Use IconHelper for flag icons 2020-10-16 09:21:26 +02:00
Jakub Onderka 813a475f4a chg: [internal] Allow to have empty nationality 2020-10-16 09:21:26 +02:00
Jakub Onderka 7aa9101e84 new: [UI] Show organisation nationality flag 2020-10-16 09:21:26 +02:00
Jakub Onderka a38afcea2a chg: [UI] Update country names 2020-10-16 09:21:26 +02:00
Alexandre Dulaunoy fdfbcf784e
Merge pull request #6447 from JakubOnderka/as-normalization 
chg: [internal] Normalize AS type to asplain notation
 2020-10-16 07:03:33 +02:00
Jakub Onderka 9e7b9becc0
Merge pull request #6446 from JakubOnderka/module-import-speedup 
chg: [internal] Speedup sending module results
 2020-10-15 23:10:25 +02:00
Jakub Onderka 28af05528f chg: [internal] Normalize AS type to asplain notation 2020-10-15 22:46:12 +02:00
Jakub Onderka 240b3434e0 chg: [internal] Speedup sending module results 2020-10-15 22:06:17 +02:00
Jakub Onderka 870021cdc0
Merge pull request #6289 from JakubOnderka/save-sighting-optim 
chg: [internal] Sighting saving optimisation
 2020-10-15 17:30:05 +02:00
Alexandre Dulaunoy 6fb78f8b77
chg: [PyMISP] updated 2020-10-15 15:13:36 +02:00