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

21079 Commits (c44e4f198e552ad23b295b50e55c78dc4493c0e6)

Author SHA1 Message Date
Jakub Onderka 98616742cd chg: [internal] Try to use array for processes 2021-11-14 19:09:38 +01:00
Jakub Onderka 81b0a7eed7 fix: [internal] Skip empty line 2021-11-14 19:09:38 +01:00
Jakub Onderka 9c60d64b04 fix: [internal] Update JSON 2021-11-14 19:09:38 +01:00
Jakub Onderka db13698ebd chg: [internal] Better submodule info fetching 2021-11-14 19:09:38 +01:00
Jakub Onderka aecf9499ad chg: [internal] Check if update is possible 2021-11-14 19:09:38 +01:00
Jakub Onderka 0cc7804219 chg: [internal] Current branch and commit checking 2021-11-14 19:09:38 +01:00
Jakub Onderka 736aba20a3 chg: [internal] More clear method names 2021-11-14 19:09:38 +01:00
Jakub Onderka a213817d11 chg: [UI] Use TimeHelper for zmq status 2021-11-14 19:09:38 +01:00
Jakub Onderka 763a9b6e6e fix: [internal] Param order 2021-11-14 19:09:38 +01:00
Jakub Onderka a424c01844 chg: [internal] Small optim 2021-11-14 19:09:38 +01:00
Jakub Onderka c388bb3882 chg: [internal] Move version checking to one function 2021-11-14 19:09:38 +01:00
Jakub Onderka e41a8a785e chg: [internal] Use GitTool for remote version fetching 2021-11-14 19:09:38 +01:00
Jakub Onderka db3183ae54 chg: [internal] Faster way how to get current commit 2021-11-14 19:09:38 +01:00
Jakub Onderka 7074647128 chg: [internal] Authkey resetting 2021-11-14 19:09:37 +01:00
Jakub Onderka bbb2ad13ca chg: [internal] Simplified remove version checking 2021-11-14 19:09:37 +01:00
Jakub Onderka 799f93d088
Merge pull request #7958 from JakubOnderka/bg-fix 
Bg fix
 2021-11-14 10:50:57 +01:00
Jakub Onderka d54c0dc04c chg: [UI] scheduler doesn't exist for SimpleBackgroundJobs 2021-11-13 11:35:05 +01:00
Jakub Onderka aaf1c01b3d chg: [CLI] Add help for Admin redisReady command 2021-11-13 11:34:27 +01:00
Jakub Onderka 38fa8d8463 fix: [internal] Private property access 2021-11-13 10:07:04 +01:00
Jakub Onderka 44279f090a chg: [internal] Avoid shell_exec 2021-11-13 10:07:04 +01:00
Jakub Onderka 553036de94
Merge pull request #7955 from JakubOnderka/code-style-background-jobs 
chg: [internal] Code style
 2021-11-12 11:48:28 +01:00
Jakub Onderka fb99021ab9 chg: [internal] Code style 2021-11-12 09:44:21 +01:00
Jakub Onderka b2c6280194
Merge pull request #7954 from JakubOnderka/sub 
new: [user] Add sub field for user
 2021-11-11 16:49:22 +01:00
Jakub Onderka 6806cdf574 new: [user] Add sub field for user 2021-11-11 16:34:27 +01:00
Jakub Onderka 2d0d5745b9
Merge pull request #7949 from JakubOnderka/server-caching 
Server caching
 2021-11-11 16:23:38 +01:00
Jakub Onderka 0311182085
Merge pull request #7953 from JakubOnderka/cached_attachments_remove 
fix: [internal] Remove unused MISP.cached_attachments setting
 2021-11-11 16:23:03 +01:00
Andras Iklody e52e7ae29c
Merge pull request #7939 from righel/add_simple_background_jobs 
Add simple background jobs
 2021-11-11 16:16:41 +01:00
Jakub Onderka 5c617e3420 fix: [internal] Remove unused MISP.cached_attachments setting 2021-11-11 14:27:10 +01:00
Jakub Onderka 6e3e727805 chg: [internal] pubsub types 2021-11-11 12:05:37 +01:00
Jakub Onderka 949970ff6e fix: [CLI] redisMemoryUsage 2021-11-11 12:05:37 +01:00
Jakub Onderka e517c8cc20 chg: [internal] Simplified Feed:getFreetextFeed method 2021-11-11 12:05:37 +01:00
Jakub Onderka 256ec0b0f3 chg: [internal] Simplified feed caching 2021-11-11 12:05:37 +01:00
Jakub Onderka 4dfa8e1a4a fix: [UI] Correct attaching cache timestamp to server 2021-11-11 12:05:37 +01:00
Jakub Onderka 996173862b chg: [internal] searchCaches code cleanup 2021-11-11 12:05:37 +01:00
Jakub Onderka bba985d320 new: [CLI] For redisMemoryUsage show also server cache size 2021-11-11 12:05:37 +01:00
Jakub Onderka 6ef90bbc92 chg: [internal] Simplify server caching 2021-11-11 12:05:37 +01:00
iglocska c6aec0046b
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-11-11 10:45:56 +01:00
iglocska 86e44ded50
fix: [CLI] fixes to the appshell 
- always load the configload task
 2021-11-11 10:45:21 +01:00
Luciano Righetti 00028760f2 fix: fix typo 2021-11-11 10:24:56 +01:00
Luciano Righetti 53ecb2f946 fix: return correct X-Result-Count value in /attributes/restSearch 2021-11-11 09:50:19 +01:00
chrisr3d 1af41a83ae
fix: [upload_stix] Going back to the previous way of handling files before we properly merge `develop` and this branch together 
- The publish flag added in `develop` remains here
  but we come back to the previous way of handling
  the input file, like before we cherry-picked the
  commit containing the changes concerning the
  publish flag.
 2021-11-10 20:22:22 +01:00
chrisr3d a9c1a4a320 Merge branch 'misp-stix' of https://github.com/MISP/MISP into misp-stix 2021-11-10 19:38:43 +01:00
iglocska 4061440cc6 chg: [stix] allow passing the publish flag to the stix upload 2021-11-10 19:37:49 +01:00
chrisr3d c9d7ad2462 Merge branch '2.4' of github.com:MISP/MISP into misp-stix 2021-11-10 19:03:11 +01:00
chrisr3d 6a3cbb2f4e Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-11-10 19:02:20 +01:00
Luciano Righetti 527b96b14c fix: wrong default 2021-11-10 18:34:26 +01:00
Luciano Righetti 979bd12625 fix: wrong default 2021-11-10 18:33:36 +01:00
Luciano Righetti 17da925afa chg: setting msg 2021-11-10 18:28:24 +01:00
Luciano Righetti 565fc26b13 chg: remove track_status setting 2021-11-10 18:24:04 +01:00
Luciano Righetti f49d2fde09 Merge branch 'develop' into add_simple_background_jobs 2021-11-10 18:09:09 +01:00