MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,098 Commits
43 Branches
370 Tags
182 MiB
Commit Graph

2098 Commits (2ef361d21acc23d9ef4902eaeb70ccde046cb2e8)

Author SHA1 Message Date
iglocska c45e64b94a Merge branch 'hotfix-2.3.31' into develop 2014-11-27 14:53:01 +01:00
iglocska 6a51da1f6a Merge branch 'hotfix-2.3.31' 2014-11-27 14:52:01 +01:00
iglocska 6548474422 Version number incremented 2014-11-27 14:51:49 +01:00
iglocska 4777cdd0ec Merge branch 'hotfix-2.3.31' 2014-11-27 14:50:53 +01:00
iglocska 71d36b9c64 Several issues fixed 
- MYSQL.sql file now correctly includes the task entries
- GenerateCorrelation admin task is now a background job
- Organisation of events pulled now get the org in the server object as the owner instead of the one who initiates the pull
- Small fix to wrapping text in the pivot graph
 2014-11-27 14:47:13 +01:00
iglocska 6dcffe1d56 Merge branch 'hotfix-2.3.30' into develop 2014-11-27 11:29:04 +01:00
iglocska cf60af7036 Merge branch 'hotfix-2.3.30' 2014-11-27 11:28:03 +01:00
iglocska dc98d6f1d3 Some freetext import tweaks, fixes #330, fixes #334 
- freetext import now optionally allows setting the comment field
- removing rows in the freetext import result redirects to the event view if all rows are gone
 2014-11-25 15:56:32 +01:00
iglocska 7c6000ec21 Incorrect flash message on successfu freetext import fixed, fixes #322 2014-11-25 13:40:24 +01:00
iglocska 9e8803c6eb Confidence mapping changed to boolean in stix export, fixes #326 2014-11-25 13:37:22 +01:00
iglocska 9fae7a2193 Alternate event org display 
- shows both orgc and org to normal users
- naming convention changed (orgc => source org, org => member org)
- this should allow users to see if an event was generated on their instance or not.
 2014-11-25 13:21:25 +01:00
iglocska a599c650e1 Merge branch 'hotfix-2.3.29' 2014-11-20 10:41:14 +01:00
iglocska 2c7b7415b9 Improvements to the attribute search 
- case insensitivity
- tag searches

also, generatecorrelation is now a background job
 2014-11-20 10:40:24 +01:00
iglocska bd84fade5b Merge branch 'hotfix-2.3.28' into develop 2014-11-19 10:26:21 +01:00
iglocska fb5b4df091 Merge branch 'hotfix-2.3.28' 2014-11-19 10:25:13 +01:00
iglocska 53c1ef40b0 Fix to the CSRF protection blocking a proposal add 2014-11-19 10:24:46 +01:00
iglocska d53e2565ef Merge branch 'hotfix-2.3.27' into develop 2014-11-14 13:15:19 +01:00
iglocska aac37b1b9d Merge branch 'hotfix-2.3.27' 2014-11-14 13:14:21 +01:00
iglocska aa492066d8 Diagnostics check fails on PGP check if the server's key is a sign only key 2014-11-14 13:12:40 +01:00
iglocska f459040bca Merge branch 'hotfix-2.3.25' into develop 2014-11-14 12:00:26 +01:00
iglocska 0097ba1943 Merge branch 'hotfix-2.3.25' 2014-11-14 12:00:00 +01:00
iglocska bfdeda99dc Further corner case fixed (shadow attribute to attribute, not event) 2014-11-14 11:59:38 +01:00
iglocska 0e47f523b9 Merge branch 'hotfix-2.3.25' 2014-11-14 11:29:09 +01:00
iglocska 01fd0b93ce Comments also sanitized 2014-11-14 11:28:42 +01:00
iglocska 2dfd9144f7 Merge branch 'hotfix-2.3.25' into develop 2014-11-14 11:16:24 +01:00
iglocska 750d6b53f4 Merge branch 'hotfix-2.3.25' 2014-11-14 11:16:13 +01:00
iglocska c67af817e0 Related events not correctly sanitized in the xml export 2014-11-14 11:15:52 +01:00
iglocska 2098c79549 Merge branch 'hotfix-2.3.25' into develop 2014-11-14 11:06:10 +01:00
iglocska e734878040 Merge branch 'hotfix-2.3.25' 2014-11-14 11:05:56 +01:00
iglocska 7a31e03021 Added to the caching mechanism 2014-11-14 11:05:37 +01:00
iglocska e9a66c711c Merge branch 'hotfix-2.3.25' into develop 2014-11-14 09:05:59 +01:00
iglocska 7883dfca1e Merge branch 'hotfix-2.3.25' 2014-11-14 09:05:10 +01:00
iglocska ad77555daa Stronger escaping of special characters in the XML exports 2014-11-14 09:04:36 +01:00
iglocska 6758650c78 Merge branch 'hotfix-2.3.24' into develop 2014-11-12 15:37:50 +01:00
iglocska a26d71e25c Merge branch 'hotfix-2.3.24' 2014-11-12 15:37:10 +01:00
iglocska 4b7e56a43c Fix to an issue with the CSV export 
- missing linebreak after header row added
- fixed an issue with quotes in the value field not being escaped properly
 2014-11-12 15:36:07 +01:00
iglocska 7dbbe163b5 Merge branch 'hotfix-2.3.23' into develop 2014-11-05 16:26:49 +01:00
iglocska dbaf97aaac Merge branch 'hotfix-2.3.23' 2014-11-05 16:26:04 +01:00
iglocska 4e116a8afe Fixes issue with file attachments not being downloadable for users of another org 2014-11-05 16:25:17 +01:00
iglocska 143e6b500c Merge branch 'hotfix-2.3.22' into develop 2014-11-03 10:00:40 +01:00
iglocska 346f6357da Merge branch 'hotfix-2.3.22' 2014-11-03 10:00:26 +01:00
iglocska ff606fc991 Document referencing deprecated way of passing authkey in url 2014-11-03 09:59:58 +01:00
iglocska 2b7a5e72f5 Merge branch 'hotfix-2.3.22' into develop 2014-11-03 09:57:39 +01:00
iglocska 160f056af8 Merge branch 'hotfix-2.3.22' 2014-11-03 09:56:50 +01:00
iglocska 9b935d14ce Added flag to mimic the quickfilter of the event view to the API 
- search on any sub-string match in the event info, orgc, attribute value, attribute comment via the API
 2014-11-03 09:55:44 +01:00
iglocska 6afa8866a6 Merge branch 'hotfix-2.3.21' into develop 2014-10-31 15:00:52 +01:00
iglocska 8948c44af4 Merge branch 'hotfix-2.3.21' 2014-10-31 15:00:10 +01:00
iglocska 85166481b7 Fix to the missing accept terms button 2014-10-31 14:59:49 +01:00
iglocska 327387908f Merge branch 'hotfix-2.3.20' into develop 2014-10-31 14:48:06 +01:00
iglocska 7f48083625 Merge branch 'hotfix-2.3.20' 2014-10-31 14:47:08 +01:00