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

3604 Commits (69c0fd8a57c2ba673d708554fd9be86e086f21a9)

Author SHA1 Message Date
Iglocska 69c0fd8a57 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-10-07 09:42:41 +02:00
Iglocska 7af3dd52cf fix: Added missing changes to the javascript file 2016-10-07 09:42:07 +02:00
Alexandre Dulaunoy fbf793dace Merge branch '2.4' of github.com:MISP/MISP into 2.4 2016-10-07 09:23:20 +02:00
Alexandre Dulaunoy b5b2449697 Chg: MISP taxonomies updated to the latest version 2016-10-07 09:22:55 +02:00
Alexandre Dulaunoy dedf1046fb Chg: misp-warninglists updated to the latest version 2016-10-07 09:19:43 +02:00
Iglocska b924d30c54 fix: Left off the actual file affected for the last commit 2016-10-06 17:27:43 +02:00
Iglocska 1a9939631b fix: Fixed a bug with the event view 
- the fetcher was moving proposals within an attribute if the proposal was directed at the attribute (correctly)
- this left the event proposal list in a non progressive array key format, which lead to a weird situation where the JSON format used string numeral keys in a dict as opposed to the desired list. Nobody in their right mind would ever want that.
- fixed
 2016-10-06 17:24:42 +02:00
Iglocska 912220fbbd fix: Fixed the incorrect column order on the event index 2016-10-06 14:38:09 +02:00
Iglocska 67d7094b03 fix: Fixed the broken check that prevented the sightings count from displaying 2016-10-06 14:35:04 +02:00
Iglocska 80eb8f5404 fix: Really restrict the shown proposal count to non deleted proposals 2016-10-06 11:37:59 +02:00
Iglocska 280f5414bf new: View proposal count on event index and filter events on whether they have proposals 
- only non deleted proposals are counted
- allows users to quickly set up filters to view all events that have pending proposals
 2016-10-06 11:33:59 +02:00
Iglocska d45d66a3bc Merge branch 'attribute_merge' into 2.4 2016-10-04 16:41:36 +02:00
Iglocska 807ee2f463 fix: Added changes to JS 2016-10-04 16:41:21 +02:00
Iglocska 4428c36cd9 fix: Added the capability to merge attachments/samples 2016-10-04 16:40:39 +02:00
Iglocska d511e80a84 Merge branch 'publishalert' into 2.4 2016-10-04 15:58:37 +02:00
Iglocska 990f97a7f7 Merge branch '2.4' into taginfo 2016-10-04 15:56:29 +02:00
Iglocska a761867117 chg: Cleanup of removed functionality 2016-10-04 14:12:46 +02:00
Iglocska d0de2cd369 fix: Fixed the event index in various places (such as the user admin view) 
- also added missing view files from previous patch
 2016-10-04 13:33:42 +02:00
Iglocska f394f469ac fix: Left off the changes to the js 2016-10-04 10:58:14 +02:00
Iglocska 72ff6c76c3 fix: Various fixes to the user index, fixes #1597, fixes #1598 
- highlight deleted users
- use the same index for the org user view (without the filter options)
- fixes the pagination of the users when viewing it through the organisation view
 2016-10-04 10:56:52 +02:00
Richard van den Berg d392bd8060 Allow merging for site admins 2016-10-04 10:24:53 +02:00
Richard van den Berg fd76247255 Avoid duplicate key-sequence to satisfy STIX unique identity-constraint 2016-10-03 16:22:41 +02:00
Richard van den Berg c44cb036ae Fix STIX XML and JSON exports 2016-10-03 16:02:16 +02:00
Richard van den Berg 87ac5f9f5a Fix indication of new attributes in E-mail alerts, fixes #1521 2016-10-02 14:46:51 +02:00
Iglocska fd959da341 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-10-02 12:47:20 +02:00
Iglocska 97c43c6c9e new: Rework of the attribute/proposal views and popovers round 2 
- also fixes to a bunch of small UI bugs and code style issues
 2016-10-02 12:46:30 +02:00
Iglocska def69dc969 new: First cut of the popover rework for form selects 2016-10-01 23:25:15 +02:00
Richard van den Berg 36971b57cd Allow merging of event attributes 2016-10-01 12:47:53 +02:00
Richard van den Berg 4383b35f0f Put tag info from event in E-mail subject, fixes #1107 2016-09-30 18:49:15 +02:00
Iglocska a706e5c59d fix: Added the git commit ID to the feed request 2016-09-30 17:26:12 +02:00
Iglocska eea83e8b86 fix: Org id potentially not being set when capturing tags 2016-09-30 16:44:29 +02:00
Iglocska 3cc484dcaf fix: Fixed an issue that resulted in empty event tags showing up in the event index JSON 2016-09-30 15:34:33 +02:00
Andras Iklody 6e85e176dc Merge pull request #1588 from RichieB2B/ncsc-nl/stix-fix 
Two small STIX fixes (again)
 2016-09-30 14:35:26 +02:00
Richard van den Berg cc36ecf445 Use consistent STIX/CyBOX IDs for domain|ip entries 2016-09-30 14:20:19 +02:00
Richard van den Berg d1f2e18e1b Correct CIQ namespace 2016-09-30 13:30:54 +02:00
Iglocska 77a0efdc54 fix: Small fix to the worker start script 2016-09-30 10:24:13 +02:00
Iglocska 091df4d286 chg: external analysis/text attributes containing a uuid converted to a link to a MISP event 2016-09-30 09:49:26 +02:00
Richard van den Berg f41729fdb3 - correct namespace order 
- stix set_id_namespace calls cybox set_id_namespace
 2016-09-29 18:03:56 +02:00
Iglocska d27bd42b07 fix: Even dirtier hack to only replace the STIX_Package object with a Package object 2016-09-29 17:04:57 +02:00
Iglocska 3d8e661be6 fix: Several fixes to the STIX export 
- based on the findings of @RichieB2B
 2016-09-29 16:46:20 +02:00
Iglocska 6c5e72efad fix: Fixed an issue with the restsearch export potentially incorrectly loading all eligible events in one go into memory 2016-09-29 14:33:56 +02:00
Iglocska 2903919fcd fix: Fix an issue where duplicates of auth methods in Security.auth keep piling up 
- due to a bug, each change in the server settings with an auth plugin enabled would reappend the full list of enabled auth plugins to Security.auth
- this lead to an exponential growth of the number of entries in the array in the config file
 2016-09-28 14:05:03 +02:00
Cristian Bell 5be1e17bce Revert "fix: missing new TLDs in free text import, solves #1149 (#1574)" 
This reverts commit e3bb9d3a42.
 2016-09-27 16:38:35 +02:00
Cristian Bell e3bb9d3a42 fix: missing new TLDs in free text import, solves #1149 (#1574) 
* fix: missing new TLDs in free text import, solves #1149
 2016-09-27 15:53:43 +02:00
Andras Iklody 01d507aa69 Merge pull request #1571 from rotanid/bugfix-php-warning 
fix: php warning on buildAlertEmailBody in Event.php
 2016-09-27 13:17:41 +02:00
Iglocska 9b7191f878 fix: Don't show the org restriction of a tag in the event view JSON 2016-09-27 09:38:32 +02:00
Iglocska 96960f16eb fix: Set the org_id field to 0 if it is not set 2016-09-27 09:25:29 +02:00
Iglocska d2a898026a fix: Removed accidentally committed code 2016-09-27 08:39:19 +02:00
Iglocska 4d19929a7c fix: fixed an anchor in the documentation 
- as pointed out by @rotanid
 2016-09-26 21:23:32 +02:00
Andras Iklody a1b106c266 Merge pull request #1575 from RichieB2B/ncsc-nl/small-fixes 
Two small fixes
 2016-09-26 17:29:28 +02:00