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

10263 Commits (4e23c23d6e1b659247e3f19bb539f61a64e00a7e)

Author SHA1 Message Date
iglocska 4e23c23d6e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-19 15:55:42 +01:00
iglocska 435bf28df6 fix: [publishing] Fixed several bugs in the background job responsible for publishing events 2018-12-19 15:55:06 +01:00
Andras Iklody dc0b8c1084
Merge pull request #3956 from dawid-czarnecki/fix/disable_correlation 
Fix disabling correlations for single attributes
 2018-12-18 13:49:51 +01:00
Dawid Czarnecki 534d5e24a6 Fix disabling correlations for single attributes 2018-12-18 13:34:48 +01:00
chrisr3d 0f15b1e5a7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 11:36:46 +01:00
chrisr3d 91b1fe1db4
fix: [stix import] Fixed parsing of Custom objects 2018-12-18 11:36:04 +01:00
iglocska 0e91baa040 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 10:25:23 +01:00
iglocska 1b358f730e fix: [correlations] Invalid orgc loaded in the attribute level correlations, fixes #3948 2018-12-18 10:24:11 +01:00
Andras Iklody c800b4b05b
Merge pull request #3954 from kfinny/fix-enrich-event-job-not-marked-as-completed 
Fixes #3907, enrich event job not marked as completed.
 2018-12-18 09:59:04 +01:00
iglocska 5e8392ae3f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 09:46:48 +01:00
iglocska ba3ae0094c chg: [WIP] added function meant to resolve id vs uuid issues for the UI attribute search 
- still needs some love
 2018-12-18 09:46:02 +01:00
iglocska b1db12d242 fix: [UI] hover size fixed and scroll bar added 
- part of the keep @rommelfs happy project
 2018-12-18 09:44:50 +01:00
Kevin 9446c93ad4 Fixes #3907, enrich event job not marked as completed. 
The enrichment background process did not do anything to update the job
after completing its task.  I used the same logic as the adjcacent
'publish' function to record progress, update the message and create a
log entry.
 2018-12-17 13:55:59 -05:00
Alexandre Dulaunoy ac063792f9
chg: [UI] Clarify the definition of "hide_tag" to an unselectable tag 2018-12-17 18:14:53 +01:00
Alexandre Dulaunoy b2b382f159
chg: [misp-galaxy] updated to the latest version (major update in Malpedia) 2018-12-15 09:29:10 +01:00
Alexandre Dulaunoy f5af41239e
chg: [misp-galaxy] updated to the latest version 2018-12-13 21:42:58 +01:00
Andras Iklody cfe3841d8d
Merge pull request #3942 from tomking2/2.4 
fix: Make IE11 compliant by adding startsWith polyfill
 2018-12-13 04:52:46 -05:00
iglocska 10557c12da Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-13 10:30:40 +01:00
iglocska be05652072 fix: [CLI] usage output fixed for the server shell tasks 2018-12-13 10:30:04 +01:00
iglocska 2ce3bdddbe fix: [sync] Fixed an incorrectly formatted event index output when minimal:1 is passed, breaking the sync pull 
- ffs
 2018-12-13 10:28:58 +01:00
Tom King 1caca3adcc fix: Make IE11 compliant by adding startsWith polyfill 2018-12-13 09:17:29 +00:00
Andras Iklody 3f07d8367e
Merge pull request #3941 from tomking2/2.4 
fix: Make IE11 compliant by removing default param value from ES2015
 2018-12-13 04:14:35 -05:00
Tom King da3bba7ba8 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:13:21 +00:00
Tom King 3c2e976997 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:07:35 +00:00
iglocska a56e1b44b5 fix: [server preview] fixed sharing groups linking to the equivalent ID sharing group on the local instance 2018-12-12 19:26:40 +01:00
iglocska 147ab92aa9 fix: [api] Fixed event index to include sharing group metadata 2018-12-12 19:24:12 +01:00
iglocska ba74597e87 fix: [Restresponse] fixed XML converter 2018-12-12 19:23:40 +01:00
iglocska a2f073e6d1 fix: [compatibility] reverted IE11 breaking change in misp.js, fixes #3939 2018-12-12 17:53:10 +01:00
iglocska fe3bf1f57a fix: [feeds] Fixed an issue that caused a misp format feed fetch to fail intermittently 2018-12-12 17:30:58 +01:00
iglocska d79757ad73 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-12 16:01:15 +01:00
iglocska c7a4b6f1f5 fix: [sync] Issue with events not updating on a pull 
- overzealous protection removed
- Conditions blocking an event edit via a pull now rely on the locking mechanism, relaxed via an internal sync link
 2018-12-12 15:58:36 +01:00
Sami Mokaddem ac0db78bc1 chg: [eventView] applied quick-edit button for comment field 2018-12-12 15:38:22 +01:00
Sami Mokaddem 1c8601c0e1 chg: [quickEditHover] change variable scope to local 2018-12-12 15:16:01 +01:00
Andras Iklody 5c202618fc
Merge pull request #3940 from mokaddem/issue#3937-quickEdit 
new: [eventview] quick edits are triggered by clicking a button
 2018-12-12 08:55:59 -05:00
Sami Mokaddem e076239a0e new: [eventview] value quickedit are triggered by clicking a button 
And no longer using double-click
 2018-12-12 14:45:18 +01:00
Sami Mokaddem 260f75d8c3 fix: [upload_analysis_file] Prevent object creation on non-existing events 2018-12-12 11:16:00 +01:00
Sami Mokaddem 244f62e355 chg: [eventGraph] added fail save if requiredOneOff is not set 2018-12-12 10:28:08 +01:00
Sami Mokaddem 5140ab0b74 fix: [eventGraph] Object's label gets set correctly 
Add both requiredOneOf and required (forgotten one) fields in the Object's label
 2018-12-12 10:25:18 +01:00
chrisr3d dee614b4b8
fix: [stix 1&2 import] Fixed version attribute of the original filename 2018-12-12 10:19:40 +01:00
chrisr3d 9d0c6fa8fe fix: [doc] Updated install guide to include the latest changes on STIX2 python library 2018-12-11 17:24:41 +01:00
chrisr3d 12b713af35
fix: [stix2 import] Allowing import of STIX 2.0 documents that have non v4 UUIDs 
- Some further operations may be done on those UUIDs later
- Atm, we (at least) avoid loading errors from the stix2 python library
 2018-12-11 15:50:14 +01:00
chrisr3d 06fff3bb32
chg: Bumped lastest cti-python-stix2 changes from our fork 2018-12-11 14:37:02 +01:00
chrisr3d f02ae5b58d
chg: [stix] Changed cti-python-stix2 submodule to our fork 2018-12-11 14:35:45 +01:00
Alexandre Dulaunoy 6a60438229
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-11 14:13:15 +01:00
Alexandre Dulaunoy cef0931d46
chg: [misp-galaxy] updated to the latest version 2018-12-11 14:12:21 +01:00
iglocska 47c9f6114e fix: [API] Attribute tags could be added by 3rd parties via the API 
- fixed
 2018-12-11 11:36:40 +01:00
Alexandre Dulaunoy cf1b346580
Merge pull request #3932 from davidonzo/2.4 
Mod headers to be enabled
 2018-12-11 10:42:11 +01:00
Davide Baglieri cb11e2f025
Mod headers to be enabled 
Apache configuration needs to load the headers module.
Added the line #103
 2018-12-11 10:35:34 +01:00
Andras Iklody 2198ec339c
Merge pull request #3927 from cvandeplas/2.4 
fix: [objecttemplates] fixes issue #3921
 2018-12-09 12:58:14 -05:00
Christophe Vandeplas 589070a5cd fix: [objecttemplates] fixes issue #3921 2018-12-09 14:58:25 +01:00