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

8999 Commits (c788dac0f11f9d3da0b348b20e5f6a4a309699dd)

Author SHA1 Message Date
iglocska 4298633e32 fix: [UI] Missing sync / feed pull/push buttons re-added 2019-03-31 10:26:52 +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
Alexandre Dulaunoy 68d9b84c1f
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-30 08:16:34 +01:00
Alexandre Dulaunoy 7c2e096250
chg: [warning-lists] updated to the latest version 2019-03-30 08:16:12 +01:00
iglocska d2bd63b236 fix: [Accessibility] Added titles to the role index icons, affects #4258 2019-03-29 21:01:32 +01:00
iglocska 76d14c00cb Merge branch 'thumbnail' into 2.4 2019-03-29 20:29:37 +01:00
Andras Iklody ed110cd962
Merge pull request #4392 from SteveClement/tools 
chg: [diag] Added a more dynamic way for submodule version status.
 2019-03-29 20:23:10 +01:00
chrisr3d 556ef2e8f8 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-03-29 18:33:33 +01:00
chrisr3d 0b422b54d8
fix: [enrichment view] Making sure the document is ready before calling any javascript 2019-03-29 18:31:27 +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
mokaddem 04fc76f11d chg: [matrixPopup] UI improvement to better support small screens. 2019-03-29 08:30:52 +01:00
mokaddem 161231dd0b fix: [thumbnail] picture preview was not showing up all the time 2019-03-28 16:13:30 +01:00
mokaddem 01b7a24d02 fix: [picturePreview] Don't show the fullscreen button if php-gd is not 
installed.
 2019-03-28 15:35:10 +01:00
chrisr3d bdff3765d1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-03-28 14:52:33 +01:00
Steve Clement b2191c9927
Merge pull request #4252 from mokaddem/sightingFiltering 
Sighting filtering
 2019-03-28 14:50:15 +01:00
iglocska 586cca384b fix: [security] Fix to a reflected XSS in the default layout template 
- as reported by Tuscany Internet eXchange | Misp Team | TIX CyberSecurity
 2019-03-28 12:05:21 +01:00
Steve Clement 3b94ab3b33 chg: [diag] Added a more dynamic way for submodule version status. 2019-03-28 10:40:32 +01:00
chrisr3d 38e1eda0bc
fix: [enrichment view] Fixed typo 2019-03-28 10:19:36 +01:00
mokaddem 9d93fa69aa chg: [restClient:querybuilder] bit of cleanup 2019-03-28 09:09:57 +01:00
couchuser12345 ea82a8ca5a
Add updateUser to default config 2019-03-27 16:27:40 -04:00
Steve Clement 823ea745be
Merge pull request #4337 from mokaddem/submoduleDiagnostic 
Submodule diagnostic
 2019-03-27 17:27:53 +01:00
mokaddem 4a37dfbf94 fix: [restClient:querybuilder] Fixed a bug where multiple rules where 
not added correctly and show API info box
 2019-03-27 16:45:35 +01:00
chrisr3d 7b7ddaabb9
fix: [stix import] Fixed issues with additional namespaces 
- Using a list where any additional namespace can
  be added
- Catching any missing additional namespace with
  the return code '4' raised in case of namespace
  not found error
 2019-03-27 15:10:31 +01:00
mokaddem 9d7e743b22 chg: [restClient:querybuilder] Prefil the QB when picking a saved query 
- WiP
 2019-03-27 14:40:08 +01:00
chrisr3d fcf9f775be Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-27 14:06:23 +01:00
chrisr3d 9d9ef1ba57
fix: [stix export] Fixed tlp markings that were obscurly set to a wrong value in some cases 
- Setting incident handling object correctly
- Avoid using distribution levels to set tlp color
 2019-03-27 13:48:52 +01:00
mokaddem ffb31c425d fix: [RestClient:queryBuilder] Distribution level in the query builder. Fix #4280 2019-03-27 12:02:57 +01:00
Alexandre Dulaunoy 02510b10ed
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-27 12:01:27 +01:00
Alexandre Dulaunoy 6b5ba6dd43
chg: [misp-galaxy] updated to the latest version 2019-03-27 12:00:36 +01:00
4ekin a57462740f fix: i18n fixed in Views and updated default.pot 
Updated default.pot file according Views and Controllers changes
Updated Views with i18n issues
 2019-03-27 13:38:50 +03:00
Steve Clement 105f363305
Merge pull request #4350 from 4ekin/russian_translation 
chg: additional Russian translation
 2019-03-27 09:18:05 +02:00
chrisr3d d8ec4e1750
fix: [enrichment view] Avoid displaying empty fields 2019-03-26 18:08:29 +01:00
4ekin b37826ab3f fix: fixed i18n string representation and android logo 
Fixed i18n string representation in views:
* Diagnostics
* Files
* Tabs
Fixed android icon dissapear in workers tab.
 2019-03-26 17:04:11 +03:00
4ekin 7a88c87b70 fix: fixed i18n string representation in Server Controller and Model 2019-03-26 17:02:05 +03:00
Olivier BERT fdf0ed7aa4 Make the submit button focusable (tabindex) in the matrix view. This is necessary for use with screen readers. 2019-03-26 12:36:32 +01: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
chrisr3d 6f3a9b2b6d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-26 10:05:41 +01:00
chrisr3d 3aadf2cbce
fix: [enrichment view] Fixed typo 2019-03-26 10:05:15 +01:00
iglocska a90eaec445 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-26 07:59:35 +01:00
iglocska eb7ea54dcb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 17:36:34 +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
chrisr3d 7234b40d8c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 17:07:44 +01:00
chrisr3d 81a8736dc2
wip: [enrichment view] Displaying sharing group distribution if needed 2019-03-25 17:06:58 +01:00
chrisr3d 3df7c31b99
fix: [enrichment] Fixed results handling function name typo 2019-03-25 17:05:53 +01:00
iglocska 3969389c60 chg: [UI] explain the authkey's source in the new server view, fixes #4368 2019-03-25 16:43:21 +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 45f84dfd72 new: [UI] disable threat level from the UI based on a server setting, fixes #4359 
- bye shitty deprecated field
 2019-03-25 12:30:38 +01:00
iglocska e5a1c51b8c fix: [UI] Remvoed broken edit org button for admins, fixes #4358 2019-03-25 12:13:16 +01:00
iglocska 607caf6b36 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-25 12:11:51 +01:00
Raphaël Vinot 0681260cde chg: Bump warninglists 2019-03-25 11:47:47 +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
Alexandre Dulaunoy 7204b4fc6a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-24 11:30:52 +01:00
Alexandre Dulaunoy 16c322cec6
chg: [warning-lists] updated to the latest version 2019-03-24 11:30:26 +01:00
iglocska a067fc769e new: [UI] Move to FA 5 2019-03-23 11:18:22 +01:00
chrisr3d 32b5ab676e
wip: [enrichment view] Test returning data from the new form 2019-03-22 22:31:56 +01:00
chrisr3d 74b405e919 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-22 17:28:44 +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 0b33adedc1 fix: fixed i18n string representation in Views 
Fix for a plenty of Views with incorrect localizations (only English
text shown)
 2019-03-21 18:10:26 +03: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
4ekin 916a8e61f6 chg: additional Russian translation 2019-03-21 17:22:10 +03:00
iglocska a590060626 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-21 09:45:17 +01:00
iglocska 6cef13b8fa fix: [exports] Fixed copy pasta fail breaking the cached exports 2019-03-21 09:44:47 +01:00
chrisr3d ec2baacd73
fix: [stix2 export] Fixed comma typo 2019-03-21 08:57:05 +01:00
chrisr3d 7d4e88b2ca Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-20 23:42:11 +01:00
chrisr3d dbbbc8fed0
fix: [stix2 export] Support of previous versions of python that are more restrictive with arguments syntax 2019-03-20 23:39:39 +01: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
iglocska e36d1f6704 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-20 13:11:25 +01:00
iglocska 510b781762 fix: [freetext] Stop parsing dates as phone numbers 2019-03-20 13:10:53 +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 b7990a108b
wip: [enrichment view] First version of the view for objects & attributes returned from misp modules 
- Visualization atm
- Submit button + related actions to come soon
- Possible changes on visual aspects to come too
 2019-03-20 11:31:09 +01:00
chrisr3d c6e7e9284b
fix: [enrichment] Set distributions & sgs for all the possible views 2019-03-20 11:28:32 +01:00
iglocska 54f9e0c172 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-20 11:23:09 +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
Alexandre Dulaunoy a70ef74dfd
chg: [misp-galaxy] updated to the latest version 2019-03-20 10:33:41 +01:00
iglocska 09ae8a5364 fix: [bro] typo fixed that caused an exception, fixes #4343 2019-03-20 07:02:50 +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 beed84a335 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-19 17:23:22 +01:00
iglocska 7141f70b20 Merge branch 'kafka' into 2.4 2019-03-19 17:23:05 +01:00
iglocska 49be0f8b7a chg: [db script] version bump 2019-03-19 17:20:46 +01:00
Andras Iklody 7f93270710
Merge pull request #4342 from liviuvalsan/bug_fix_bro_export 
Fixing bug when exporting to Bro MISP attributes from events that contain a percentage sign inside the event info
 2019-03-19 16:49:00 +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 dc2b7f8675 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-19 16:00:23 +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
Andras Iklody 2fd599b172
Merge pull request #4341 from liviuvalsan/attribute_performance_improvements 
Addressing performance issues for fetching attributes when blocking attributes via proposals
 2019-03-19 15:34:41 +01:00
Liviu Valsan 4656a5c1fa Fixing bug when exporting to Bro MISP attributes from events that contain a percentage sign inside the event info 2019-03-19 14:46:16 +01:00
Liviu Valsan fe3241addb Addressing performance issues for fetching attributes when blocking attributes via proposals 2019-03-19 14:23:08 +01:00
mokaddem f20eb8eded Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-19 14:06:08 +01:00
mokaddem 54f1d3bdff fix: [Galaxy:update] Cast GalaxyElement into a String Ensuring the correct type 
before the insertion
 2019-03-19 13:57:16 +01:00
iglocska 9a863b3bb2 fix: [ACL] Fixed ACL 2019-03-19 11:18:12 +01:00
iglocska 1779871e7e fix: [rest client] Made the links more obvious 2019-03-19 11:12:24 +01:00
iglocska 351d7948de Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-19 10:55:52 +01:00