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
mokaddem 59b29dd667 chg: [Attribute] Added loading icon when downloading pictures 2019-03-14 11:16:43 +01:00
iglocska 79b0be30f6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 08:46:35 +01:00
iglocska fb26e3495f chg: [cakephp version] bump 2019-03-14 08:46:10 +01:00
Steve Clement 39b9ac6ca0
Merge pull request #4293 from 4ekin/russian_translation 
fix: Merge issue
 2019-03-14 11:46:36 +06:00
Alexandre Dulaunoy 2544170208
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 06:32:42 +01:00
Alexandre Dulaunoy 2cf64d545c
chg: [misp-galaxy] updated to the latest version 2019-03-14 06:32:15 +01:00
iglocska eaf71ef6eb fix: [Training] Cause I'm a lumberjack and I'm ok 2019-03-13 18:06:31 +01:00
iglocska 0e76537f7a fix: [Training] AAARGH 2019-03-13 17:31:07 +01:00
iglocska af8f730ebf fix: [training] Further work on the script 2019-03-13 17:27:20 +01:00
iglocska ca4c31dcc0 fix: [training] Allow for self signed certs 2019-03-13 17:20:37 +01:00
iglocska 3dc0244177 fix: [training] Siplified key management 2019-03-13 17:18:55 +01:00
iglocska 86b8fe3a30 fix: [Training] Further fixes 2019-03-13 17:11:04 +01:00
iglocska cbdd2e2cfc fix: [training script] Added some resilience to prior partial executions 2019-03-13 16:58:40 +01:00
iglocska e72e96d85f fix: [training] Fixes based on failed executions 2019-03-13 16:41:27 +01:00
mokaddem 1c367231b7 chg: cleanup 2 2019-03-13 16:15:52 +01:00
mokaddem 92af9e44b1 chg: clean-up 2019-03-13 16:14:14 +01:00
iglocska 712509206c fix: [training script] Case sensitivty fixed 2019-03-13 16:05:25 +01:00
mokaddem 89191c6818 new: [Attribute] Added possibility to view and resize images. Added 
php-gd dependency!
 2019-03-13 15:58:28 +01:00
iglocska e49adab132 chg: [training] Some additional changes 2019-03-13 15:50:37 +01:00
iglocska 69fc0edc69 chg: [training script] Added server indication 2019-03-13 15:43:27 +01:00
iglocska e29985b6ab fix: [training script] verbose mode added 2019-03-13 15:40:56 +01:00
iglocska d5f62f62d8 fix: [training script] Minor fixes 2019-03-13 15:28:42 +01:00
iglocska 4c72f22516 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-13 15:09:35 +01:00
iglocska eb101c97c4 fix: [training] training setup script now correctly handles settings 2019-03-13 15:08:58 +01:00
Andras Iklody 3e25f98c4d
Merge pull request #4299 from nikofil/zmq_flag_fix 
Fix checking of incorrect flags when publishing to ZMQ
 2019-03-13 16:03:06 +02:00
mokaddem 0763d15486 fix: Added missing view 2019-03-13 14:16:37 +01:00
mokaddem 07002c7389 chg: [Attribute] Image thumbnail and view image 2019-03-13 13:58:37 +01:00
iglocska 97b626a593 fix: [UI] Removed input field from form where it's not applicable 2019-03-13 13:26:22 +01:00
iglocska 7ceb64e0ba new: [exercises] Added a new setup script for configuring exercise infrastructures rapidly 
- assumes a hub MISP and a set of training MISPs for different participating teams
- This script is to be executed on the hub MISP and assuming a consecutively incrementing numeric component in the training MISPs' URL it will pre-configure them
- each instance has to have the same API key for the site admin (the idea is to clone training VMs)

- configuration creates users, organisations, sync users, sync connections across both the hub and the individual trainee instances
- Just copy /var/www/MISP/app/Console/Command/training.default.json to /var/www/MISP/app/Console/Command/training.json and configure it to get started
 2019-03-13 12:24:53 +01:00
iglocska f47b5643fd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-13 12:06:01 +01:00
Nikos Filippakis b783b5e393 Fix checking of incorrect flags when publishing to ZMQ 
* Check Plugin.ZeroMQ_event_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in Event.php
* Check Plugin.ZeroMQ_audit_notifications_enable instead of Plugin.ZeroMQ_user_notifications_enable in Log.php
* Check Plugin.ZeroMQ_object_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in MispObject.php

Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-13 11:51:40 +01:00
iglocska 7b34e8cacb fix: [API] resetting the authkey didn't respond with the new key before, making automation difficult. 2019-03-12 22:03:34 +01:00
mokaddem 04798bf7e4 new: [galaxyMatrix] Added possibility to pick a galaxy to view it's 
statistic.
 2019-03-12 15:36:00 +01:00
4ekin e7a66859e8 fix: News View add, index and Controller (flash messages i18n bug 2019-03-12 17:26:44 +03:00
4ekin f79a18040b fix: Admin User index, view, edit i18n bug 
fix: User view i18n bug
 2019-03-12 16:55:38 +03:00
mokaddem d9ca64b37f chg: [distributionNetwork] Prevent interactive picking in event index 2019-03-12 14:47:34 +01:00
4ekin 840a2fb7e8 fix: Attributes index wrong ditribution field 
fix: Logs search bug i18n
fix: Organisations index bug i18n
 2019-03-12 16:45:48 +03:00
4ekin 3e4b7b76b3 fix: Merge issue 
chg: Russian translation
 2019-03-12 14:52:35 +03:00
mokaddem 05edf15e43 fix: [disitributionNetwork] Empty cached org on redraw 2019-03-12 11:38:52 +01:00
mokaddem d67af3c4dd fix: [distributionGraph] Transform associative array into regular array 2019-03-12 10:59:51 +01:00
mokaddem 8a5cce8cb3 chg: [distributionNetwork] Improved consistency in event index and 
improved UX - WiP
 2019-03-12 10:47:16 +01:00
Alexandre Dulaunoy 5648f3634d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-12 10:38:48 +01:00
Alexandre Dulaunoy af9fda9a5c
chg: [warning-lists] updated to the latest version 2019-03-12 10:38:16 +01:00
mokaddem 4104860246 chg: [distributionNetwork] Added missing JS 2019-03-12 08:16:14 +01:00
mokaddem 968d578e38 chg: [distributionNetwork] Integration with event index - WiP 2019-03-12 08:15:49 +01:00
chrisr3d bacb4ecab5
wip: [hover enrichment] Started changing hover enrichment as well 
- As for enrichment modules, it does not change
  the support of the current modules, and should
  not interfere with them either
 2019-03-11 23:47:03 +01:00
chrisr3d 0bb088bf00
wip: [enrichment] Started changing enrichment modules 
- Passing full attributes to the new modules
- No changes for the currently used modules
- Using a parameter to specify which format to use
- Current format used if no parameter is set
/!\ WIP, more to be updated soon /!\
 2019-03-11 23:33:26 +01:00
Alexandre Dulaunoy fb99d65076
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-11 19:27:56 +01:00
Alexandre Dulaunoy 1e859827be
chg: [misp-galaxy] updated to the latest version 2019-03-11 19:27:29 +01:00
iglocska 6f46c022de fix: [object references] Fixed an issue with the reference type not being loaded correctly 2019-03-11 16:44:34 +01:00
iglocska 11cd59b941 fix: ['rest client'] Python script generator fixed 2019-03-11 16:36:46 +01:00
mokaddem 6a7efb92c5 chg: [distributionGraph] Added bar chart and deferred distribution data 
fetching process
 2019-03-11 14:24:15 +01:00
iglocska 8b8d6c9256 fix: [export] cached exports for bro were broken 
- bro still hasn't been migrated to restsearch
- the exception for this in the caching algorithm called the wrong function
 2019-03-11 10:29:45 +01:00
iglocska f331eecf33 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-10 18:10:38 +01:00
iglocska fc34510eda new: [Feeds] New overlap tool finished 
- compare a feed against a combination of feeds/servers to find if you can cover the contents with a combination of other cached feeds
 2019-03-10 18:09:46 +01:00
iglocska 947e59aec7 new: [Feeds] Implementation of the feed coverage tool (WIP) 2019-03-09 22:19:37 +01:00
Alexandre Dulaunoy 14f51e0845
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-09 17:31:33 +01:00
Alexandre Dulaunoy e343a24984
chg: [warning-lists] updated to the latest version 2019-03-09 17:31:11 +01:00
Steve Clement 8423183631 fix: [i18n] Stray file removed. 2019-03-08 09:37:35 +06:00
Steve Clement cfae9ff845 Merge branch '2.4' into i18n 2019-03-08 09:28:26 +06:00
Alexandre Dulaunoy 41ef1d0eff
chg: [misp-galaxy] updated to the latest version 2019-03-07 15:23:29 +01:00
Steve Clement 3c554c5a96 Merge branch '2.4' into i18n 2019-03-07 10:41:13 +06:00
iglocska f550d3c412 chg: [feeds] inThreat feed removed as it's no longer available 2019-03-06 08:17:13 +01:00
iglocska 124be4103d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-06 08:10:03 +01:00
iglocska 3a24056cdd fix: [UI] Missing org logos added to statistics -> organisations page, fixes #4271 2019-03-06 08:08:44 +01:00
Steve Clement 5e4607b8c0 Merge branch '2.4' into i18n 2019-03-06 08:15:09 +06:00
Steve Clement 17ffb73531 chg: [i18n] Various updates to translations, most notably French is at 100% again. 
new: [i18n] Added initial Swedish and Polish translations
chg: [i18n] Updated default.pot
 2019-03-06 08:11:45 +06:00
Andras Iklody 59771dfbc7
Merge pull request #4275 from RichieB2B/ncsc-nl/workers-stop 
Add workers stop script
 2019-03-05 23:36:37 +01:00
Alexandre Dulaunoy e9674943fb
chg: [tasks] anchor typo fixed 2019-03-05 17:36:46 +01:00
Richard van den Berg 0d4de16bcd Add workers stop script 2019-03-05 17:35:55 +01:00
iglocska ef14b778fd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-05 15:12:27 +01:00
iglocska f145f40057 new: [API] Add pagination related parameters to event index, fixes #4270 2019-03-05 15:11:49 +01:00
Richard van den Berg 460a9df081 Add correct PyMISP_dir to sys.path 2019-03-05 08:33:28 +01:00
Alexandre Dulaunoy 648c136d9d
chg: [warning-lists] updated to the latest version 2019-03-04 23:11:44 +01:00
Alexandre Dulaunoy 5f00dc8a4f
chg: [taxonomies] updated to the latest version (LS19 exercise) 2019-03-04 23:11:10 +01:00
Olivier BERT 805d17d895 Event index: Aria label properties on view/edit/publish/delete links for better consistancy accross screen readers and accessibility standards compliance. 2019-03-04 20:32:44 +01:00
Andras Iklody 24efd437c4
Merge pull request #4262 from 4ekin/fix-wrong-i18n 
fix: Events index filter button i18n bug
 2019-03-04 20:10:51 +01:00
Steve Clement 837c8e196d
Merge pull request #4263 from SteveClement/tools 
chg: [Tools] misp-backup/-restore improvements, quality of life improvements of worker start.sh
 2019-03-05 03:01:45 +09:00
4ekin 9b0efffcd8 fix: More filter element i18n bug 2019-03-04 18:44:12 +03:00
4ekin 5de89ff666 fix: Events index filter button i18n bug 2019-03-04 17:55:40 +03:00
Steve Clement a5ec453f40 chg: [workers] Worker start script has initial support to only restart the workers that are not running. 2019-03-04 20:39:12 +09:00
mokaddem 9a60df98b2 chg: remove debug 2019-03-04 10:38:44 +01:00
mokaddem f2c2ade76b Merge branch '2.4' of github.com:MISP/MISP into extendedDistributionGraph 2019-03-04 10:35:49 +01:00
mokaddem 0892967c6d fix: [distributionGraph-network] fixed sharing group singleton 2019-03-04 09:59:28 +01:00
iglocska bb837afba6 fix: [API] hacky fix to capitalisation issues between the old /events/index camelcased parameters and the newer lowercased one, fixes #3855 2019-03-04 09:09:35 +01:00
iglocska e5abc97df5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-03 23:42:11 +01:00
iglocska 45fdac214f fix: [grammar] Pluralisation fixed for the freetext import results, fixes #4021 
- Sunday last minute commit aced
 2019-03-03 23:41:58 +01:00
Steve Clement f1f70ca996
Merge pull request #3827 from MISP/fix3819 
Allow getting object attribute via rest query. fix #3819
 2019-03-03 08:51:38 +05:30
Steve Clement 0328b1b04a
Merge branch '2.4' into add-email-field-option-for-kerberos-authentication 2019-03-03 07:39:45 +05:30
Steve Clement f03c519038
Merge pull request #3658 from ancailliau/issue-3639 
Fixes issue #3639
 2019-03-03 07:35:13 +05:30
iglocska 66ad17a1ee new: [API] exposed change_pw function to the API, fixes #4256 2019-03-02 23:47:13 +01:00
Raphaël Vinot a300cf5a2e chg: Bump PyMISP to 2.4.103 2019-03-02 00:33:52 -08:00
mokaddem 4727628143 chg: [distributionGraphNetwork] Improved sharing accuracy 2019-03-01 16:18:08 +01:00
mokaddem ead0b96e13 chg: [distributionGraphNetwork] Adjusted gravitationalConstant and mass 2019-03-01 14:55:51 +01:00
mokaddem e60720a54c Merge branch '2.4' of github.com:MISP/MISP into extendedDistributionGraph 2019-03-01 13:31:22 +01:00
Alexandre Dulaunoy 4f495ff746
chg: [ReST interface] fix typo in label 2019-03-01 12:46:01 +01:00
Alexandre Dulaunoy 6ded134a9c
Merge pull request #4243 from raw-data/2.4 
[add] MalSilo feeds tracking commodity malware
 2019-03-01 12:34:46 +01:00
mokaddem 1186afe817 new: [eventindex] clicking on sightings count redirect to the event with `sighting only` filter activated 2019-03-01 12:01:02 +01:00
mokaddem 823078f834 new: [eventFiltering] Added support of sighting filtering 2019-03-01 11:54:29 +01:00
mokaddem a40d42cbce chg: [galaxy_matrix] Added submit button again 
to please.. they will recognize themselves.
 2019-03-01 11:21:31 +01:00
mokaddem 1632a37b1e Merge branch '2.4' of github.com:MISP/MISP into extendedDistributionGraph 2019-03-01 10:59:11 +01:00
mokaddem 24d8f197ef new: [DistributionGraph] Added pie chart on sharing group. fix #4101 2019-03-01 10:56:33 +01:00
iglocska e0a38b3cc0 fix: [API] Allow adding objects without having the correct template via the API fixed 2019-03-01 10:00:54 +01:00
iglocska d6f7e18e6f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-01 06:57:58 +01:00
iglocska f11a0dad0d chg: [recommended versions] Added note on deprecating PHP 7.1 and Python 2.7 2019-03-01 06:56:02 +01:00
Steve Clement dee930ca14 Merge remote-tracking branch 'upstream/2.4' into tools 2019-03-01 10:58:43 +05:30
Steve Clement fdb8378522 new: [cli] Added getWorkers to cake Admin Shell. It returns a JSON with the status of the current workers. 2019-03-01 10:57:39 +05:30
iglocska c69969329d fix: [vulnerability] Fixes a vulnerability where a user can view sightings that they should not be eligible for 
- requires access to the event that has received the sighting
- affects instances with restrictive sighting settings (event only / sighting reported only)

- as reported by Tyler McLellan of CanCyber.org
 2019-02-28 20:27:36 +01:00
raw-data 6f2f013d18 [add] MalSilo feeds tracking commodity malware 2019-02-28 16:13:09 +00:00
mokaddem 49b2967033 Merge remote-tracking branch 'origin/2.4' into extendedDistributionGraph 2019-02-28 16:34:15 +01:00
mokaddem 6b6d07abb2 fix: [distributionGraph:network] Only use sharing group part of the 
event
 2019-02-28 16:12:43 +01:00
mokaddem aad2060fa2 fix: [distributionGraph] Org's name with spaces can be focused 2019-02-28 15:42:11 +01:00
mokaddem cbf156d87d chg: [distributionGraph] Improved UI and added close button 2019-02-28 15:20:38 +01:00
mokaddem 091a239e73 chg: [distributionGraph] Added description on blocked distribution edge 2019-02-28 15:01:10 +01:00
mokaddem 8bec4df16d chg: [distributionGraph] Added possibility to focus on an organisation 2019-02-28 14:55:38 +01:00
mokaddem 3311f5af4b chg: [distributionGraph] Show `event is empty` if the event is empty 2019-02-28 13:39:53 +01:00
mokaddem daebb1f0e7 chg: [distributionGraph] Added interactive plotting feature 2019-02-28 12:39:40 +01:00
iglocska 8e591f2843 fix: [UI] Contributors - file left off 2019-02-28 09:29:59 +01:00
iglocska 4e5fcbcbc2 fix: [UI] Contributor list fixed 2019-02-28 08:30:17 +01:00
iglocska 0cbd53f3e7 fix: [feed] Feed pulls don't update the timestamp of the event 
- affects freetext feeds
- this blocks the further propagation of the modifications
 2019-02-27 20:53:33 +01:00
iglocska 99b2dad95d fix: [ACL] added toggleToIDS 2019-02-27 20:29:56 +01:00
iglocska e2031ffcf0 chg: [UI] Event index icons switched to FA in preparation of the BS4 move 2019-02-27 19:46:16 +01:00
mokaddem fd453eafb2 chg: [distributionGraph] Pin node after drag 2019-02-27 15:54:05 +01:00
mokaddem ef045e01b3 chg: [distributionGraph] Added support of sharing group - WiP 2019-02-27 15:34:20 +01:00
mokaddem 63bc9c5967 chg: [distributionGraph] Continuation of integration, basic distribution 
is supported - WiP
 2019-02-27 11:43:07 +01:00
Alexandre Dulaunoy ec72a19d46
chg: [objects] updated to the latest version 2019-02-27 07:24:13 +01:00
Steve Clement 640c7f9ac9 chg: [tools] misp-workers.service need to be able to be installed on a stick MISP install (Ubuntu) other flavours want to be marked as such. (and in a seperate directory, ideally, etc/systemd/system) 
chg: [tools] Backup script todo added
chg: [tools] worker start script todo and fix me added
 2019-02-27 07:58:46 +05:30
iglocska 9e46340b74 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-26 18:12:11 +01:00
iglocska a0d30fb1dc fix: [docs] added object template update CLI command to the automation page 2019-02-26 18:11:34 +01:00
mokaddem af735901fd new: [eventview] Shows number of object in the event 2019-02-26 16:33:37 +01:00
mokaddem 3f292458ec chg: [attribute row] to_ids flag edition is done with a checkbox + 
prompt.

Previously, was a select.
 2019-02-26 16:24:01 +01:00
mokaddem ecc8c5f2bf chg: [quickEdit UI] Does not resize a column anymore 2019-02-26 15:29:46 +01:00
mokaddem 85f9ec97f0 fix: [generic_picker] fix #4219 (Adding ObjectReference) 2019-02-26 15:23:40 +01:00
mokaddem 2260be4194 chg: [distributionGraph] Started advanced distribution view 2019-02-26 14:40:48 +01:00
iglocska 1b418e39ad Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-26 14:11:52 +01:00
iglocska 3afc8cc304 fix: [API] Attribute edit error response fixes, #4221 2019-02-26 14:09:41 +01:00
mokaddem e42b945b11 chg: [distributionGraph] Replaced all tabs by spaces 2019-02-26 10:16:02 +01:00
mokaddem cc6732e71e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-26 09:08:17 +01:00
mokaddem 4daca2c4de chg: [eventMatrix] Added description of the cluster title and set 
default score to 0
 2019-02-26 09:07:21 +01:00
iglocska 524ed1e8ac fix: [UI] show object UUID via the UI 2019-02-25 23:07:04 +01:00
iglocska adaf27883d fix: [performance] Massive performance bug resolved for taxonomy tag selector 2019-02-25 22:53:31 +01:00
iglocska bcff745a50 chg: [UI] Highlight scope toggle if scope is selected 2019-02-25 22:28:34 +01:00
iglocska 1b4f7dfeeb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-25 22:22:28 +01:00
iglocska 3ec00f1005 fix: [UI] Fixed issues with the eventattribute tabs, fixes #4211 2019-02-25 22:19:58 +01:00
chrisr3d eeb20b4abc
fix: [UI] Fixed exclamation point for critical alerts in server settings 2019-02-25 17:26:04 +01:00
mokaddem e4148a535c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-25 16:55:11 +01:00
Alexandre Dulaunoy 1f7a5f5fc7
chg: [taxonomies] updated to the latest version 2019-02-25 16:42:47 +01:00
mokaddem 3c8fdb2615 fix: typo parameter 2019-02-25 15:33:15 +01:00
mokaddem d7d1dce025 chg: Added a dot and sanitization of the id 2019-02-25 15:12:50 +01:00
mokaddem 32c3665fb3 chg: [eventIndex] When clicking on the correlation count in the event 
index, filter the viewed event with `correlation only`
 2019-02-25 15:08:08 +01:00
iglocska 129ea0a6f9 chg: [UI] added icon for background workers 2019-02-25 14:03:41 +01:00
iglocska 1aeda907d3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-25 13:58:31 +01:00
iglocska 12ffbf991b fix: [UI] Worker tab missing in diagnostic tool 2019-02-25 13:58:08 +01:00
Alexandre Dulaunoy 8057cd4128
chg: [misp-objects] updated to the latest version 2019-02-25 09:35:41 +01:00
iglocska c042721689 fix: [UI] Invalid requirements passed to scaffolding system in regards to the show attribute context button 2019-02-24 00:23:19 +01:00
iglocska cdc97ee268 new: [UI] Rework of the attribute index toolbar on the event view 2019-02-24 00:20:25 +01:00
iglocska 232ccaffb8 fix: [UI] Another switch to FA 2019-02-24 00:19:34 +01:00
iglocska 891580f2ea fix: [UI] Switched to FA for the warning icons on the attribute values 2019-02-24 00:19:07 +01:00
iglocska 2bb4bebce6 fix: [correlation UI] Fixed an issue where the cache contained correlations to a feed/server that is no longer in the DB 2019-02-23 18:52:34 +01:00
iglocska 742f236ee1 fix: [enrichment] UI errors fixed when no modules are enabled 
- also fixed the weird indentation
 2019-02-23 18:50:43 +01:00
iglocska c6887b725c fix: [UI] Don't show the filter bar in the server settings where it wouldn't do any good 2019-02-23 18:50:11 +01:00
iglocska e931b6b80a fix: [UI] Fix add object menu item 
- make the scaffolding system aware of the possibility that "this" might get passed along to javascript
 2019-02-23 18:39:56 +01:00
iglocska ad8eb0ed47 new: [UI] Added quickfilter for the server settings 
- no more **** around trying to find the right settings!
 2019-02-23 17:50:32 +01:00
iglocska 82402ed532 fix: [UI] Side menu missing the update warninglists button 2019-02-23 17:13:58 +01:00
iglocska 01e6231349 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-23 17:01:44 +01:00
iglocska 6aaaed2ac8 new: [UI] Further work on the server settings UI 
- overview reworked
- some minor adjustements
 2019-02-23 17:01:03 +01:00
Andras Iklody 8d75a01b37
Merge pull request #4203 from eCrimeLabs/2.4 
Update defaults.json (Phishtank - Exclude through regex)
 2019-02-23 16:24:40 +01:00
iglocska 384a51e144 chg: [querystring] bumped 2019-02-23 16:20:15 +01:00
iglocska 93c17d38e0 fix: [UI] Alignment issue resolved on the user view 2019-02-23 16:19:00 +01:00
iglocska b7ffc5c363 new: [UI] Reworked the sharing group add/edit tool 2019-02-23 16:18:34 +01:00
iglocska e96164e9f5 chg: [cleanup] Junk removed 2019-02-23 16:18:17 +01:00
iglocska c20acb2f2b chg: [UI] nav tabs ontop of lists should be able to display custom titles on hover 2019-02-23 16:17:31 +01:00
iglocska 1272ad4d82 new: [UI] rework of the server settings 2019-02-23 16:17:09 +01:00
eCrimeLabs 2195375286
Updated defaults.json 
Bugfixed Phishtank
 2019-02-23 14:09:52 +00:00
eCrimeLabs 71f6ddf172
Update defaults.json 
Updated Phishtank feed with regex to exclude Phishtank url's
\/^http:\\\/\\\/www.phishtank.com\/i
 2019-02-23 13:16:21 +00:00
iglocska e006448259 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-23 13:00:12 +01:00
iglocska 152e57401f chg: [internal] Allow the quickfilters to work on URLs that include more than just the baseurl+controller+action 2019-02-23 12:59:16 +01:00
iglocska 8596311006 new: [UI] Updated the server preview index to follow the new tab UI standards 2019-02-23 12:58:54 +01:00
iglocska 30ab738f7e fix: [UI] Fixed a bug in the UI that caused the event filtering to break 2019-02-23 12:58:29 +01:00
iglocska d5939c735f new: [UI] Refactored the feed preview index UI to the new tab system 2019-02-23 12:57:39 +01:00
iglocska 8b68dbc7e2 new: [Feed preview UI] Added quick filter to the MISP feed preview 2019-02-23 12:57:00 +01:00
iglocska 47d139c296 chg: [CS] indentation 2019-02-23 12:55:43 +01:00
iglocska 373c8a5c4f fix: [UI] Pass the server ID to the view for the menu's consistency 2019-02-23 12:54:54 +01:00
Olivier BERT 97d1a1fc64 /tags/search was only looking for cluster synonyms, but not in cluster values. 2019-02-23 00:43:35 +01:00
Alexandre Dulaunoy ab687aed1b
chg: [misp-galaxy] updated to the latest version 2019-02-22 22:55:24 +01:00
iglocska 3718a89b9a fix: [DB] removed not null constraint of the kill chain order field, fixing 4198 2019-02-22 08:04:23 +01:00
iglocska 98cf493611 fix: Object could not be added with no full group by enabled, fixes #4195 2019-02-22 07:52:53 +01:00
iglocska f6467f39f9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-22 07:11:15 +01:00
iglocska 3c030152bc fix: fixed list regex menu option, fixes #4197 2019-02-22 07:10:24 +01:00
Andras Iklody 9231c660e6
Merge pull request #4194 from gallypette/hotfixGlobalMenuSeparator 
Fix #4193 GlobalMenuSeparator not checking Roles
 2019-02-21 15:22:30 +01:00
Jean-Louis Huynen e033cab8fa
Fix #4193 GlobalMenuSeparator not checking Roles 2019-02-21 15:11:46 +01:00
Richie B2B 60a41cf478
Fix errors in TagCollections import 2019-02-21 10:04:43 +01:00
iglocska 6cf49e318e fix: [UI] New thread button fixed 2019-02-21 08:00:51 +01:00
iglocska 21081937e5 fix: [UI] Terms and conditions &amp; removed from button 2019-02-21 07:59:36 +01:00
iglocska f4f4be1724 fix: [UI] Add sharing group button removed if no permissions present 2019-02-21 07:58:21 +01:00
iglocska 5e4c0579fb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-21 07:49:36 +01:00
iglocska ff31141d2c fix: [UI] trash icon was black on black on event multi delete 2019-02-21 07:48:39 +01:00
Alexandre Dulaunoy 80ccf8868a
Merge pull request #4183 from DomainTools/update-hover-ui 
chg: Update hover UI
 2019-02-21 07:40:39 +01:00
iglocska 7f020c78cb Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-20 23:02:56 +01:00
iglocska 53837c85f2 new: [UI] Added javascript to support the index filtering 2019-02-20 23:02:32 +01:00
iglocska fdaf0919d3 new: [UI] Tied the index filter system into all indeces 
- WIP: Event view
 2019-02-20 23:02:02 +01:00
iglocska 696856f06e new: [UI] Added new system to template index filters 2019-02-20 23:01:29 +01:00
chrisr3d f01b7433de Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-20 21:00:20 +01:00
chrisr3d f3ae3a7f12
fix: [stix2 import] Fixed marking parsing to avoid trying to add None 2019-02-20 20:54:31 +01:00
wagena ef1523bd95 fix Useless assignment to local variable 2019-02-20 11:45:02 -08:00
wagena a33b5f6e65 fix missing variable declaration 2019-02-20 10:57:19 -08:00
wagena 8b9436d3fe Merge branch '2.4' into update-hover-ui 2019-02-20 09:06:36 -08:00
Alexandre Dulaunoy 98cb4e63d4
chg: [misp-objects] updated to the latest version 2019-02-20 10:44:21 +01:00
iglocska c3e971476c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-19 09:39:23 +01:00
iglocska 71c4014ba5 new: [setting] Use the new setting to set the urls to the current instance on sharing groups when pushing the info via the API 2019-02-19 09:38:37 +01:00
iglocska fede678d5d new: [setting] Added new setting to set external baseurl 
- idea is to decouple the baseurl (used to prepend links) from the announce baseurl (for sharing groups / emailing)
 2019-02-19 09:37:56 +01:00
iglocska c16157ff60 fix: [UI] side menu truncated settings in the global actions scope 2019-02-19 09:37:10 +01:00
Richie B2B 6ae5ee8fe5
Fix broken "List Tags" link 2019-02-18 17:38:38 +01:00
iglocska 76cd240182 chg: [cleanup] removed unused template 2019-02-18 14:39:33 +01:00
iglocska f039f02e6d fix: [SMIME] Formating issues resolved 2019-02-18 14:37:42 +01:00
iglocska 7f95be9b0d new: [Rest client] Download results as file 2019-02-18 14:36:51 +01:00
iglocska c754e3b967 new: [API] restsearch returns more information about the export system used via headers 2019-02-18 14:33:43 +01:00
iglocska eb0abc4451 fix: [API] Invalid URL parameter suggested in rest client templates for the attribute edit endpoint, fixes #4159 2019-02-17 16:17:52 +01:00
iglocska a34d4dcfb2 fix: [UI] Logout fixed 2019-02-16 18:20:19 +01:00
Alexandre Dulaunoy 0a47c3e3be
Merge pull request #4076 from mokaddem/eventFiltering 
Event filtering tool
 2019-02-15 16:34:15 +01:00
mokaddem 1feb96b034 new: [eventFiltering] Added support of toIDS 2019-02-15 16:28:04 +01:00
Andras Iklody e0e0f25148
Merge pull request #4165 from MISP/bugfix/x-result-count 
[fix] Correct X-Result-Count
 2019-02-15 16:01:17 +01:00
mokaddem a77e08548e Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-15 15:58:03 +01:00
iglocska 2e8f255da9 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-15 15:53:24 +01:00
iglocska b0361efc2f fix: [UI] UI monkey cannot z-index 2019-02-15 15:53:01 +01:00
Alexandre Dulaunoy 514b54b2ec
Merge pull request #4164 from MISP/tempoparyFixMatrixStat 
Tempopary fix galaxy_matrix heatmap (mitre-attack)
 2019-02-15 15:45:22 +01:00
mokaddem 7e64a9d1c4 Merge branch '2.4' of github.com:MISP/MISP into eventFiltering 2019-02-15 15:22:46 +01:00
Hannah Ward 8eb9013f49
fix: Do not increment count after DB query 2019-02-15 14:19:37 +00:00
Hannah Ward 3bb3a59e1c
fix: Expose x-result-count to CORS 2019-02-15 14:07:59 +00:00
mokaddem 1ed609872c chg: simplified condition 2 2019-02-15 15:04:07 +01:00
mokaddem 97b9e14a32 chg: simplified condition 2019-02-15 15:03:03 +01:00
Hannah Ward d4224f10c1
new: Add pre-pagination result count to headers 
Fixes #4161
 2019-02-15 13:48:48 +00:00
mokaddem c4a96c2941 fix: [matrix_score] get values regardless of the galaxy 2019-02-15 14:48:15 +01:00
mokaddem 7a2010fb0e chg: [galaxy_matrix] TEMPORARY - Merge scores of both deprecated and mitre-attack 
galaxy namespace for the matrix view.

This commit aims to still have correct scores in the galaxy_matrix until the fixMitreTags functions is not live and running
 2019-02-15 14:41:55 +01:00
iglocska 4b71eced00 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-15 12:59:20 +01:00
iglocska 55ba0d6773 new: [UI] Moved the global menu to the new system 2019-02-15 12:57:45 +01:00
iglocska 566a57efdf new: [UI] Added templates for the new global menu system 2019-02-15 12:56:48 +01:00
Andras Iklody 61b7619f97
Merge pull request #4158 from MISP/bugfix/disappearing-cors-headers 
fix: re-add CORS headers on REST Response
 2019-02-15 12:51:48 +01:00
Alexandre Dulaunoy fdc8b8c47e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-15 10:37:26 +01:00
Alexandre Dulaunoy 4b0974450d
chg: [misp-galaxy] updated to the latest version 2019-02-15 10:32:20 +01:00
mokaddem 24d0cf13a9 chg: [generic_picker] added an icon to show that a galaxy will trigger 
the matrix galaxy picker
 2019-02-15 10:14:14 +01:00
mokaddem 58b3ab32de chg: [galaxy] json_encode kill_chain_order in beforeValidate 2019-02-15 09:54:39 +01:00
mokaddem d00f2742c8 Merge branch '2.4' of github.com:MISP/MISP into udpatedMatrix 2019-02-15 09:41:52 +01:00
mokaddem 9fa063cbe8 chg: [galaxy_matrix] renamed view_matrix into view_galaxy_matrix 2019-02-15 09:41:17 +01:00
mokaddem 12ed3457e8 chg: [galaxy_matrix] cleanup in variable names to be more generic 2019-02-15 09:24:52 +01:00
Alexandre Dulaunoy 435ca87424
chg: [misp-galaxy] updated to the latest version 2019-02-15 09:17:57 +01:00
Alexandre Dulaunoy 768c4f8dfd
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-02-15 08:49:36 +01:00
Alexandre Dulaunoy 4599a7cbe9
chg: [misp-galaxy] updated to the latest version 2019-02-15 08:49:11 +01:00
Hannah Ward 3a7911eb33
fix: re-add CORS headers on REST Response 2019-02-14 18:05:28 +00:00
Hannah Ward 451a9db3a1
new: Add CORS settings for external integration 2019-02-14 16:32:50 +00:00