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

3294 Commits (ea07083fe2b93a494b135651ccab379781bf42b6)

Author SHA1 Message Date
chrisr3d cdaff75ec4
chg: [ObjectReference] Referenced id, uuid & type set now from a function that could be reused 2019-04-11 09:23:16 +02:00
chrisr3d 16ade8856c Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-10 13:27:29 +02:00
iglocska 156d979133 fix: [ACL] HELLO @RichieB2B! fixed invalid capitalisation in the queryACL 2019-04-10 10:31:21 +02:00
iglocska 29598c2475 new: [API] Update JSON exposed to the API 2019-04-10 10:09:25 +02:00
Steve Clement 356a4636d5
Merge branch '2.4' into submoduleUpdatev4 2019-04-10 13:15:35 +09:00
chrisr3d 7b4c09a249
wip: [enrichment] Capturing objects & attributes 2019-04-08 19:07:13 +02:00
chrisr3d a52ab4a616 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-08 17:38:22 +02:00
iglocska 11856261ef fix: [bug] Fixed broken multi-attribute tagger 2019-04-08 15:16:33 +02:00
mokaddem fe00c4d193 chg: [diagnostic:submodule] Started integration of update DB after pull 
with workers
 2019-04-05 14:28:19 +02:00
Steve Clement c8274c476e
Merge pull request #4427 from mokaddem/submoduleUpdatev3 
Submodule updateV3
 2019-04-05 18:18:35 +09:00
mokaddem 3778c4686b fix: [acl] added route 2019-04-05 10:54:32 +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
chrisr3d 109b785e25 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-04 23:29:55 +02:00
chrisr3d 0727192c01
fix: [enrichment] Fixed handleModuleResults input variable name 2019-04-04 23:29:13 +02:00
Andras Iklody c484f01449
Fix: [acl] added missing entry 
This message was sent from my Blackberry.
 2019-04-04 17:35:34 +02:00
mokaddem 368dce6bd8 new: [diagnostic:submodule] Added output message after update - WiP 2019-04-04 16:48:41 +02:00
chrisr3d d6e8a74d49
fix: [enrichment] Fixed missing merge conflict 2019-04-04 16:40:32 +02:00
chrisr3d e238e5e3ec Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-04 16:35:14 +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
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
chrisr3d d3d23b3ae7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-04 14:54:12 +02:00
chrisr3d 041ee4d5da
fix: [enrichment] Avoiding errors on distribution and sharing group data 
- Making sure we do have a value for distribution
  and sharing group
- Avoid translating distribution levels into their
  human meaning because the output process capturing
  data from the form will anyway use the numeric
  values. Readable values are btw displayed in the
  form for users confort
- Also sanitized data displayed
 2019-04-04 14:21:10 +02:00
chrisr3d 8983ddf009
fix: [enrichment] Testing if an object has attributes before looping over them 2019-04-04 14:20:00 +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
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 ad53fc2c17 fix: [API] /objects/view should return dictionary not list 2019-04-04 10:11:07 +02:00
Steve Clement 0cfe265469
Merge pull request #4410 from 4ekin/fix-i18n 
Fix i18n in controllers, views, Attribute model
 2019-04-04 16:14:36 +09:00
chrisr3d 590a18656d
add: [enrichment] Added MISP Objects distribution in the view 2019-04-03 22:44:21 +02:00
iglocska 6f6e41b497 new: [tags] refactor of the tag picker 
- massive performance boost
- re-introduction of the custom tags
 2019-04-03 15:52:05 +02:00
iglocska bb42cf79ba fix: [UI] Performance boost for the tag selector 2019-04-03 10:50:52 +02:00
Steve Clement 6ef74e4f67
Update WarninglistsController.php 
Added more __()
 2019-04-03 10:52:18 +09:00
Steve Clement 2b5fb170c1
Update WarninglistsController.php 
typo
 2019-04-03 10:40:49 +09:00
4ekin c32d3bce32 fix: Fixed i18n strings in Controllers 2019-04-02 16:57:41 +03:00
mokaddem f03cae5f46 chg: [diagnostic] Improved submodules version and added individual 
update
 2019-04-02 11:29:10 +02:00
iglocska c6974d217e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-01 16:21:30 +02:00
iglocska dc39255be5 fix: [ACL] Added ACL for the new cache searches 2019-04-01 16:16:16 +02:00
iglocska ab858d5f17 new: [feeds] Feed/Server cache search added 
- /feeds/searchCaches added
 2019-04-01 16:09:24 +02:00
iglocska a10e175f83 fix: [API] Feed index shouldn't adhere to pagination defaults of the UI, fixes MISP/misp-book#149 2019-04-01 14:20:09 +02:00
Andras Iklody c86d82e898
Merge pull request #4387 from mokaddem/prefillQB 
Prefill the restclient querybuilder when picking a saved query
 2019-03-30 22:45:32 +01:00
iglocska 76d14c00cb Merge branch 'thumbnail' into 2.4 2019-03-29 20:29:37 +01:00
chrisr3d ba5ec4ee46
fix: [enrichment] Set potentially missing category, ids & distribution values before going to the view 
- Set the default values in the controller's side instead of the view's side
 2019-03-29 18:27:40 +01:00
Steve Clement b2191c9927
Merge pull request #4252 from mokaddem/sightingFiltering 
Sighting filtering
 2019-03-28 14:50:15 +01:00
Steve Clement 823ea745be
Merge pull request #4337 from mokaddem/submoduleDiagnostic 
Submodule diagnostic
 2019-03-27 17:27:53 +01:00
mokaddem ffb31c425d fix: [RestClient:queryBuilder] Distribution level in the query builder. Fix #4280 2019-03-27 12:02:57 +01:00
4ekin 7a88c87b70 fix: fixed i18n string representation in Server Controller and Model 2019-03-26 17:02:05 +03:00
iglocska 27d5c1ed6f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-26 10:18:39 +01:00
iglocska 1380a4797a new: [UI] FA5 update finalised 
- includes helpers to untangle the branded icon mess
 2019-03-26 10:17:59 +01:00
iglocska 96951afc47 fix: [sync] Adding a new server caused the pull/push rules to be incorrectly set to an empty string over '[]' causing sync issues, fixes #4369 
- this fix resolves the issue - new servers added should be fine
- it also retroactively fixes broken server connections
 2019-03-25 17:36:01 +01:00