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

3267 Commits (c788dac0f11f9d3da0b348b20e5f6a4a309699dd)

Author SHA1 Message Date
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
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
iglocska 5e7e0817ad Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 16:27:19 +01:00
iglocska bf841282ce new: [export] Replaced the old non-cached export page 
- uses restsearch
- similar UI to the cached exports
 2019-03-25 16:26:29 +01:00
chrisr3d 4858b0181c
fix: [ACL Component] Added new function (for new modules format) in the list 2019-03-25 15:53:15 +01:00
chrisr3d 21d9a20c32 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 15:06:12 +01:00
iglocska b656448bc1 fix: [bug] Fixed a bug that caused attributes not to save via the UI 2019-03-25 13:30:31 +01:00
iglocska 5f87ee0d2a fix: [UI] Inconsistend pluralisation fixed, fixes #4360 2019-03-25 12:34:17 +01:00
iglocska 607caf6b36 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 12:11:51 +01:00
iglocska b519230f28 fix: [API] fixed adding malware-samples unencrypted with the encrypt key set, fixes #4355 2019-03-24 22:30:41 +01:00
chrisr3d 32b5ab676e
wip: [enrichment view] Test returning data from the new form 2019-03-22 22:31:56 +01:00
chrisr3d ecbe782709
wip: [enrichment view] Made IDS, comment and distribution changeable 
- Applied on each attribute and object attribute
  returned as part of the module results
 2019-03-21 17:40:48 +01:00
4ekin 0e8621f6ff fix: fixed i18n string representation in Controllers 
Fixed i18n string representation (flash and exception messages) in
controllers:
* OrganisationController
* RolesController
* TaxonomiesController
 2019-03-21 18:10:26 +03:00
Andras Iklody 8fc80d09c0
Merge pull request #4346 from mokaddem/matrixOnGalaxyLevel 
new: [cluster] Display heatmap on the Att&ck Matrix for all tagged data.
 2019-03-20 15:08:34 +01:00
mokaddem 016893210d new: [cluster] Display heatmap on the Att&ck Matrix for all tagged data. 
fix #4344
 2019-03-20 14:30:05 +01:00
chrisr3d 4f7a034a91 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-20 11:45:54 +01:00
chrisr3d c6e7e9284b
fix: [enrichment] Set distributions & sgs for all the possible views 2019-03-20 11:28:32 +01:00
iglocska f3d2b1d15a new: [tagging] Stop pre-populating forms for tagging / attaching of galaxies 
- avoids any potential CSRF issues, the form is fetched just in time for the submission
 2019-03-20 11:21:40 +01:00
chrisr3d 465e69f84b
fix: [enrichment] Fixed variable name typo 2019-03-20 11:18:22 +01:00
Andras Iklody bcca86c468
Merge pull request #4308 from mokaddem/galaxyMatrixStat 
Galaxy matrix statistics available for eligible galaxy
 2019-03-19 17:25:10 +01:00
iglocska 7141f70b20 Merge branch 'kafka' into 2.4 2019-03-19 17:23:05 +01:00
iglocska e8263467df fix: [taxonomies] Counts fixed 2019-03-19 16:40:35 +01:00
iglocska e028c1a886 fix: [ACL] fixed 2019-03-19 16:32:20 +01:00
iglocska 6efd909bfe new: [Required taxonomies] 
- Flip taxonomies into required mode to ensure that events cannot be published without at least one tag from each required taxonomy to be set
 2019-03-19 15:59:31 +01:00
iglocska 9a863b3bb2 fix: [ACL] Fixed ACL 2019-03-19 11:18:12 +01:00
iglocska 351d7948de Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-19 10:55:52 +01:00
iglocska 7fbc4dc34c new: [REST client] Added history/bookmarks 2019-03-19 10:55:27 +01:00
chrisr3d 5dcd4dba47
fix: [enrichment] Fixed $event variable handling + monkey typo 2019-03-18 18:17:55 +01:00
chrisr3d 81a0cd2974
wip: [enrichment] Handling module results and passing it to the view 
- Work in progress on the view right now
 2019-03-18 18:05:18 +01:00