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

13246 Commits (d08586f0c1cd80a2ae1bc1fec4860189a4a640a9)

Author SHA1 Message Date
mokaddem d08586f0c1
chg: added CR/LF 2019-09-12 09:17:58 +02:00
mokaddem 5e5818fdae
chg: [sql] align initial perm with sightings 2019-09-12 09:17:24 +02:00
mokaddem 6b9c600ce5
fix: [decaying:tool] Replaced `title` function into `text` 2019-09-10 15:46:40 +02:00
mokaddem 35e2c62947
chg: [app] bumped queryversion 2019-09-10 15:43:20 +02:00
mokaddem f3860ade80
Merge remote-tracking branch 'origin/2.4' into decaying 2019-09-10 15:40:25 +02:00
iglocska 8a8ac9852c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-10 15:23:31 +02:00
iglocska 77f767ff02
fix: [internal] blackhole function default fixed 2019-09-10 15:22:55 +02:00
Andras Iklody ddeb9af29e
Merge pull request #5132 from JakubOnderka/patch-27 
fix: [feed] When fetching feeds, accept also text/plain in HTTP
 2019-09-10 14:47:31 +02:00
Jakub Onderka 609998e24c
fix: [feed] When fetching feeds, accept also text/plain in HTTP 2019-09-10 12:21:42 +02:00
Andras Iklody aec9de74c1
Merge pull request #5121 from JakubOnderka/remove-netgeoip 
chg: Remove not used Net_GeoIP submodule
 2019-09-10 11:34:17 +02:00
Andras Iklody c30d1abb9c
Merge branch '2.4' into remove-netgeoip 2019-09-10 11:34:09 +02:00
Andras Iklody ab1f0def3d
Merge pull request #5125 from JakubOnderka/patch-25 
fix: Require exact monolog version 1.24
 2019-09-10 11:32:52 +02:00
Andras Iklody 6b42f089cd
Merge pull request #5129 from JakubOnderka/array-copy-remove 
chg: [users] Remove unused method UsersController::arrayCopy
 2019-09-10 11:32:30 +02:00
iglocska 42a9e533b2
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-10 10:25:42 +02:00
iglocska e6e5f737d3
fix: [ACL] Added resetremoteauthkey to the ACL system 2019-09-10 10:25:14 +02:00
Andras Iklody 17777e105a
Merge pull request #5128 from JakubOnderka/patch-26 
fix: [audit] Correct title in audit log when admin edit user
 2019-09-10 09:10:25 +02:00
Jakub Onderka 1cd2ff5ca6 chg: [users] Remove unused method UsersController::arrayCopy 2019-09-09 23:37:37 +02:00
Jakub Onderka 50a0f564c6
fix: [audit] Correct title in audit log when admin edit user 2019-09-09 19:34:38 +02:00
Alexandre Dulaunoy 6e78bb654f
chg: [misp-galaxy] updated to the latest version 2019-09-09 16:05:07 +02:00
iglocska d1e3f0455a
fix: [sync] Post test fixed for sync users 2019-09-09 15:36:30 +02:00
iglocska 226ccd6de5
chg: [sync] Further improvements to the connection test logging 2019-09-09 15:35:05 +02:00
iglocska 6580e951e0
chg: [sync] Connection test POST test logs the full response, not just the expected part 2019-09-09 15:27:36 +02:00
iglocska 33f7444fe9
new: [auth key fail logging throttle] Throttle the auth key failed log entries to 1 / hour / key 2019-09-09 14:09:18 +02:00
Jakub Onderka ad331e8c06
fix: Require exact monolog version 1.24 2019-09-09 13:29:51 +02:00
iglocska 91e43787e0
chg: [version] bump 2019-09-09 13:06:31 +02:00
iglocska e89d1a267d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-09 13:03:09 +02:00
iglocska 75acd63c46
fix: [security] Fix to a vulnerability related to the server index 
- along with various support tools
- more information coming soon
 2019-09-09 13:00:21 +02:00
mokaddem 73babe7bf7
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-09-09 11:30:10 +02:00
mokaddem 901a70eb04
chg: [decaying:update] Added a warning in case the folder is empty 2019-09-09 11:27:27 +02:00
mokaddem 4b4b4ced4e
chg: [server:submodule_version] Whitelisted `misp-decaying-models` for 
the UI
 2019-09-09 10:59:31 +02:00
mokaddem 768b7ef7d5
chg: [gitmodule] Added git-submodule `misp-decaying-models` 2019-09-09 10:56:41 +02:00
Sami Mokaddem 936a745135
Merge pull request #5119 from JakubOnderka/patch-24 
fix: [UI] Removed duplicate button title in userIndexTable.ctp
 2019-09-09 09:26:37 +02:00
Andras Iklody 65be5dfc03
Merge pull request #5120 from JakubOnderka/gpg-composer 
Install Crypt_GPG by composer
 2019-09-08 22:20:14 +02:00
Alexandre Dulaunoy bd7f7b7b3a
Merge pull request #5103 from JakubOnderka/circl-key-server-description 
fix: [UI] GPG keys are fetched from CIRCL keyserver
 2019-09-08 09:20:15 +02:00
Jakub Onderka 26cc067587 chg: Remove not used Net_GeoIP submodule 2019-09-07 09:45:33 +02:00
Jakub Onderka 4b1645a54e fix: Throw exception when GnuGP homedir is not set 2019-09-07 00:01:55 +02:00
Jakub Onderka becee3b772 chg: Install crypt_gpg by composer 2019-09-06 22:00:56 +02:00
Jakub Onderka 863e38807d chg: Allow to load Crypt_GPG from composer 2019-09-06 21:31:16 +02:00
Jakub Onderka a0733e6429
fix: [UI] Removed duplicate button title in userIndexTable.ctp 2019-09-06 18:48:33 +02:00
chrisr3d eebeeb9804 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 17:07:30 +02:00
chrisr3d 9d3e340b52
fix: [stix2 import] Fixed hash patterns import for external STIX files 2019-09-06 17:06:38 +02:00
Andras Iklody 22d4216c9e
Merge pull request #5117 from JakubOnderka/patch-23 
fix: [UI] Fetching GPG keys
 2019-09-06 16:31:41 +02:00
mokaddem 1d378fd7bd
Merge remote-tracking branch 'origin/2.4' into decaying 2019-09-06 16:21:17 +02:00
mokaddem e3fea69f5e
chg: [decaying:import] When importing a model, mapping is imported as custom mapping 2019-09-06 16:09:39 +02:00
Jakub Onderka f63cfc9c5a
fix: [UI] Fetching GPG keys 
This error was introduced in 600e540516
 2019-09-06 15:56:01 +02:00
iglocska 36ef32392e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 15:55:41 +02:00
iglocska 5e1a26afa0
fix: [internal] orgs restricted to a domain displayed incorrectly 
- afterfind messes up the keys by reusing the same var for an inner loop
 2019-09-06 15:54:58 +02:00
mokaddem ecbea013a1
fix: [decaying:import] imported models from directory are correctly 
saved as default
 2019-09-06 15:50:24 +02:00
mokaddem 0d0002ee70
fix: [decaying:import] Correctly remove id, uuid and preserve the import 
data
 2019-09-06 15:42:52 +02:00
mokaddem 21b2da356e
chg: [decaying] Round all sightings at once 2019-09-06 15:33:18 +02:00