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

11613 Commits (55e57cdf6fd8f8ce679d140c0fefe013307b792c)

Author SHA1 Message Date
mokaddem fe00c4d193 chg: [diagnostic:submodule] Started integration of update DB after pull 
with workers
 2019-04-05 14:28:19 +02:00
Alexandre Dulaunoy 95682cf753
chg: [misp-objects] updated to the latest version 2019-04-05 11:36:17 +02:00
Steve Clement c8274c476e
Merge pull request #4427 from mokaddem/submoduleUpdatev3 
Submodule updateV3
 2019-04-05 18:18:35 +09:00
Steve Clement 3dbb9c0a5c
Update Server.php 
Small typo
 2019-04-05 18:14:56 +09:00
mokaddem 3778c4686b fix: [acl] added route 2019-04-05 10:54:32 +02:00
iglocska 0c6c688483 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-05 10:48:01 +02:00
mokaddem 4216c9385b chg: [diagnostic:submodule] General improvements (see below) 
- Allow update button reuse (avoiding blackhole)
- Improved feedback when errors
- Check if submodules are readable
 2019-04-05 10:46:49 +02:00
iglocska a26b38e2f5 fix: [feeds] Stop the reset of the attribute count after a feed pull is completed, fixes #4414 2019-04-05 10:46:32 +02:00
chrisr3d 2a82e500e4
fix: [diagnostic] Fixed required stix2 version to the latest one 2019-04-05 10:00:13 +02:00
Steve Clement a5ac115212
Merge pull request #4430 from SteveClement/guides 
chg: [doc] Updated debian guides
 2019-04-05 15:24:03 +09:00
Steve Clement 708ac49e0e chg: [doc] Debian testing is working 2019-04-05 15:23:07 +09:00
Steve Clement 1fe6607b6d chg: [doc] Tried to update the debian install guide. 2019-04-05 13:02:40 +09:00
Andras Iklody c484f01449
Fix: [acl] added missing entry 
This message was sent from my Blackberry.
 2019-04-04 17:35:34 +02:00
Raphaël Vinot 1adbe7f84d
Merge pull request #4399 from GOVCERT-LU/chg_add_pipenv 
Install python dependencies via Pipfile instead of manually cloning / installing them
 2019-04-04 16:58:57 +02:00
mokaddem 368dce6bd8 new: [diagnostic:submodule] Added output message after update - WiP 2019-04-04 16:48:41 +02:00
iglocska d3d242117e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 16:36:00 +02:00
iglocska aaf6738064 new: [CLI] Set default role via the CLI 2019-04-04 16:35:27 +02:00
chrisr3d df59c69134 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 16:25:14 +02:00
chrisr3d dabb87bf4b
wip: [enrichment] Removed debug calls 
- Before having new modules fully operational, let
  us at least not keep only 2 debugs within an
  exposed function
 2019-04-04 16:22:02 +02:00
mokaddem 8be3bca422 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 15:23:08 +02:00
Andras Iklody 4adf3aebea
Merge pull request #4425 from mokaddem/improvedSubmoduleDiagnostic 
Improved submodule diagnostic
 2019-04-04 15:11:14 +02:00
iglocska 251836ff97 fix: [UI] First recorded change fixed to not be copy pasta of the last change's timestamp 2019-04-04 15:00:05 +02:00
iglocska 9893a0839f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 13:42:39 +02:00
iglocska 7a1dbe4c1f fix: [API] role_id is not required when POSTing users if a default role is set on the instance 2019-04-04 13:42:06 +02:00
Georges Toth c788dac0f1 added "fileobjects" to PyMISP; updated PyMISP and stix2 refs 2019-04-04 13:37:46 +02:00
Andras Iklody 235fad24c8
Merge pull request #4419 from RichieB2B/ncsc-nl/sql-cleanup 
Be consistent in quoting table names
 2019-04-04 13:18:45 +02:00
Andras Iklody 78d94870e4
Merge pull request #4421 from andir/2.4-linotp 
new: WIP LinOTP authentication
 2019-04-04 13:18:23 +02:00
Georges Toth 8c7395d9b9 add Pipfile and Pipfile.lock 2019-04-04 13:16:22 +02:00
Andras Iklody 7f09d52045
Merge pull request #4420 from RichieB2B/ncsc-nl/misp-wipe-update 
Update misp-wipe
 2019-04-04 11:51:03 +02:00
mokaddem ee838b1593 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 11:43:20 +02:00
Richard van den Berg be3d76d8c1 Wipe new SQL tables in misp-wipe 2019-04-04 11:40:40 +02:00
Richard van den Berg 1a855f2ddf Be consistent in quoting table names 2019-04-04 11:27:16 +02:00
iglocska ee23056237 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 11:24:20 +02:00
iglocska 13fb91a101 Merge branch 'feature/assetloader' into 2.4 2019-04-04 11:24:05 +02:00
iglocska e397bdbb39 new: [UI] refactor of the asset loading 2019-04-04 11:22:59 +02:00
Raphaël Vinot 599590e923 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:54:12 +02:00
Raphaël Vinot a54899a34b fix: Missing test files in PyMISP 2019-04-04 10:54:04 +02:00
iglocska 8e124dc4d5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:48:34 +02:00
iglocska 4d3d8b1b9a fix: [UI] Reverted some breaking changes 2019-04-04 10:48:10 +02:00
Raphaël Vinot b543e5bda5 chg: Bump PyMISP 2019-04-04 10:44:53 +02:00
iglocska 31ac700a15 fix: [API] Correctly embed attributes and the event metadata in the object via /objects/view/[ID] 2019-04-04 10:35:53 +02:00
iglocska 7b9c1c9f24 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 10:11:37 +02:00
iglocska ad53fc2c17 fix: [API] /objects/view should return dictionary not list 2019-04-04 10:11:07 +02:00
chrisr3d 825a0a1aab Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-04-04 09:49:53 +02:00
iglocska b2ebee7e48 fix: [JS] fixed a JS breaking bug 2019-04-04 09:37:52 +02:00
iglocska f2a75336ea Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-04 09:35:47 +02:00
iglocska e6ceed598d fix: [UI] Changed the querystring loading for css/js 2019-04-04 09:35:20 +02:00
chrisr3d f933355513 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-04-04 09:22:28 +02:00
Steve Clement 91c0faf9dc
Merge pull request #4416 from tom564/patch-1 
Fix blank $PATH_TO_MISP
 2019-04-04 16:21:09 +09:00
Steve Clement 70a57c9587
Merge pull request #4413 from iwitz/2.4 
fix: allow x-frames in apache configs
 2019-04-04 16:17:25 +09:00