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

17410 Commits (42d3f92c9f544f9aaafd99d31dce33dc5b4a6996)

Author SHA1 Message Date
mokaddem 42d3f92c9f fix: [galaxy:update] Make sure the fake user has the perm_sync right 2020-11-18 09:36:57 +01:00
mokaddem 89f307bd07 Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-18 09:22:40 +01:00
Jakub Onderka 7d7bd14145
Merge pull request #6496 from JakubOnderka/experimental-stream-convert 
Experimental: new: [internal] JSON stream convert
 2020-11-18 00:15:18 +01:00
Jakub Onderka 2104f617b0
Merge pull request #6589 from JakubOnderka/group-search-current-value 
chg: [UI] For search field, by default put current search term
 2020-11-17 22:24:32 +01:00
Jakub Onderka 12f84b0d69
Merge pull request #6587 from JakubOnderka/authkey-view 
Authkey view permission fix
 2020-11-17 21:25:38 +01:00
Jakub Onderka 791dc9deab new: [internal] JSON stream convert 2020-11-17 19:28:59 +01:00
Jakub Onderka 83945e4885
Merge pull request #6604 from JakubOnderka/github-test-changes 
GitHub test changes
 2020-11-17 17:32:44 +01:00
Jakub Onderka f1d8bf60e4
Merge pull request #6605 from JakubOnderka/php-extension-diagnostic 
chg: [diagnostic] Smarter PHP extension diagnostics
 2020-11-17 17:06:15 +01:00
Jakub Onderka ad742975de fix: [test] Do not pull PyMISP 2020-11-17 15:04:08 +01:00
Jakub Onderka 38c4cea820 chg: [test] Do not run workers in background 2020-11-17 15:04:08 +01:00
Jakub Onderka db1e7621b2 fix: [internal] MISP update without branch 2020-11-17 15:04:08 +01:00
Jakub Onderka 4ea0ba3267 fix: [test] Run updates 2020-11-17 15:04:08 +01:00
Jakub Onderka 248550004d chg: [test] Run under multiple PHP versions 2020-11-17 15:04:08 +01:00
Jakub Onderka 983c723475 chg: [test] Merge common commands 2020-11-17 15:00:45 +01:00
Jakub Onderka 5a597ca3db chg: [diagnostic] Smarter PHP extension diagnostics 2020-11-17 14:08:37 +01:00
mokaddem 222b40c800
Merge branch 'feature-report-from-event' into 2.4 2020-11-17 13:38:20 +01:00
mokaddem c8462c5791
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 13:35:40 +01:00
Alexandre Dulaunoy eb4f739b7e
chg: [warning-list] updated 2020-11-17 13:30:14 +01:00
mokaddem 8c87998981
chg: [export:textExport] Filter out deplicated values 
Fix #6603 for attribute scope
 2020-11-17 12:09:45 +01:00
mokaddem ffa0ab54f9
fix: [attribute:fetch_attributes] Respect group_by request 2020-11-17 12:08:46 +01:00
mokaddem 217abfc2f8
fix: [mispObject:save_object] Returns error in correct format. 
Fix #6598
 2020-11-17 11:37:40 +01:00
mokaddem 9135a1ca8d
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 11:05:44 +01:00
mokaddem 399f2f7720
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-17 11:04:41 +01:00
Sami Mokaddem 32e7a3a5c3
Merge pull request #6580 from Maddosaurus/fix-plugin-setting-spelling 
Fix: Fix spelling of sightings_anonymise_as description
 2020-11-17 11:04:25 +01:00
mokaddem 3ccaa50a37
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-17 10:33:22 +01:00
mokaddem 86b0f75700
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 10:31:39 +01:00
Raphaël Vinot 03544e69a0 fix: Perms in travis, var in gh action 2020-11-17 10:09:05 +01:00
Raphaël Vinot 10a6e60dd6
Merge pull request #6600 from MISP/github_action_2 
chg: try to fix weirdness in PyMISP git history
 2020-11-17 00:55:48 +01:00
Raphaël Vinot f4f54a07cc fix: Just make config writable by everyone, again 2020-11-17 00:46:22 +01:00
Raphaël Vinot 1adb832972 fix: Just make config writable by everyone 2020-11-17 00:27:00 +01:00
Raphaël Vinot cdbea5e983 chg: Set USER everywhere 2020-11-17 00:15:56 +01:00
Raphaël Vinot 195405924e chg: Bump PyMISP 2020-11-17 00:06:29 +01:00
Jakub Onderka 15ffa8e967
Merge pull request #6601 from JakubOnderka/fix-diagnostic-download 
fix: [internal] Diagnostic data download
 2020-11-16 23:59:54 +01:00
Raphaël Vinot a95c5379d1 chg: try to fix weirdness in PyMISP git history 2020-11-16 23:49:59 +01:00
Jakub Onderka 7c85cdf88c fix: [internal] Diagnostic data download 2020-11-16 23:48:01 +01:00
Jakub Onderka 22a121e21a
Merge pull request #6599 from JakubOnderka/misp-update-fix 
fix: [internal] Server::update method
 2020-11-16 23:32:51 +01:00
Jakub Onderka 24301af247 fix: [internal] Server::update method 2020-11-16 23:22:27 +01:00
Raphaël Vinot 2b38d77b86 new: Github action 2020-11-16 23:12:00 +01:00
Jakub Onderka a2449f9c02
Merge pull request #6597 from JakubOnderka/zmq-setting-change-fix 
fix: [internal] Initialize ZMQ just when necessary after setting change
 2020-11-16 21:48:35 +01:00
Jakub Onderka 14efe5681c fix: [internal] Initialize ZMQ just when necessary after setting change 2020-11-16 20:37:27 +01:00
Raphaël Vinot 0683fae0bf
Merge pull request #6596 from JakubOnderka/bump-pymisp 
chg: Bump PyMISP
 2020-11-16 19:59:28 +01:00
Jakub Onderka fd9baef7c0
Merge pull request #6588 from JakubOnderka/gpg-version-diagnostics 
new: [diagnostic] Show installed GnuPG version
 2020-11-16 17:46:31 +01:00
Jakub Onderka cd92104215 chg: Bump PyMISP 2020-11-16 17:29:17 +01:00
iglocska 459144011e
fix: [event index] search via attribute key allows for empty input now 2020-11-16 16:17:47 +01:00
mokaddem 9db29821b4
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-11-16 16:11:17 +01:00
mokaddem 334b7cabe1
fix: [tag:search] Correctly pass user data 2020-11-16 15:14:37 +01:00
mokaddem b99603bb91
chg: [mysql] Reverted changes to be aligned with db_version 2020-11-16 15:06:25 +01:00
iglocska 5a29fcc370
Merge branch 'session_destruction' into 2.4 2020-11-16 15:02:04 +01:00
mokaddem f0bc398e60
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-16 14:59:17 +01:00
Jakub Onderka c51cd36ac3 fix: [internal] Destroy session just when session is started 2020-11-16 14:58:12 +01:00