MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
11,478 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

11478 Commits (9893a0839fb0f6981ce891895a5c5ccdfb50a25e)

Author SHA1 Message Date
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
Steve Clement a25c1ca8fc
Merge pull request #4381 from 4ekin/fix-i18n 
Fix i18n in Views and updated default.pot
 2019-03-27 11:49:47 +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
Andras Iklody e52c528943
Merge pull request #4373 from 4ekin/fix-i18n 
Fix i18n and Android icon in workers
 2019-03-26 17:00:16 +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
Andras Iklody f37feacf85
Merge pull request #4370 from obert01/fix-matrix-submit-btn-accessibility 
Make the submit button focusable (tabindex) in the matrix view.
 2019-03-26 14:19:37 +01: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
Raphaël Vinot bd39ce4104 chg: Bump PyMISP (test case bug) 2019-03-25 16:12:45 +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
Raphaël Vinot bd767fcd13 chg: Add details when the ACLs are broken. 2019-03-25 15:42:14 +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
Raphaël Vinot ab69dbadc4 chg: Bump pymisp (improve test cases) 2019-03-25 10:57:46 +01:00
Raphaël Vinot f0c0eaf264 chg: Bump pymisp (more details in test cases) 2019-03-25 10:39:20 +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
Andras Iklody af590b12e9
Merge pull request #4351 from 4ekin/fix-i18n 
Fix i18n in Controllers and Views
 2019-03-22 19:56:56 +00:00
chrisr3d 74b405e919 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-22 17:28:44 +01:00