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

5000 Commits (b5ddbebe3455255bafe038fe34c584b2ea13b0fb)

Author SHA1 Message Date
Iglocska e31e36deca Merge branch '2.4.52' into 2.4 2016-10-07 20:26:30 +02:00
Iglocska 721cfd8d98 fix: Fixes to the ssdeep detection as it was way too loose 2016-10-07 20:20:53 +02:00
Iglocska 9d4403ff3e fix: Resolved several issues with error handling in the new feed system 2016-10-07 20:08:57 +02:00
Iglocska 209f2f1d00 Revert "fix: Removed already removed file that got reverted" 
This reverts commit 832321a77c.
 2016-10-07 18:39:09 +02:00
Iglocska 832321a77c fix: Removed already removed file that got reverted 
- As first committed by @rotanid
- The file is not used any longer, however removing it causes issues unless we clean the model cache
- upgrading to a new version will force the cleaning of the model cache, so it's a great time to finally remove it
 2016-10-07 18:28:48 +02:00
Iglocska 9649c608b4 fix: Various fixes to the feed system 
- allow users to override the IDS flags and keep all attributes pulled from a freetext feed IDS = off
- UI changes
- fix to a bug that caused already deleted attributes to be counted as existing ones
 2016-10-07 18:27:13 +02:00
Iglocska a6cb34e4a3 fix: Added missing initialisation of the synctool 2016-10-07 17:36:46 +02:00
Iglocska 503661a240 new: First implementation of the freetext feed pull 2016-10-07 17:33:54 +02:00
Andras Iklody 6f058d197f Merge pull request #1600 from RichieB2B/ncsc-nl/update-tags 
Add missing tags from pushed events
 2016-10-07 14:40:01 +02:00
Richard van den Berg 8a72bd43a2 Add missing tags from pushed events 2016-10-07 14:21:01 +02:00
Alexandre Dulaunoy fe972118d5 Chg: Updated to the latest MISP taxonomies 2016-10-07 10:57:16 +02:00
Alexandre Dulaunoy 158f4124e0 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2016-10-07 10:53:57 +02:00
Alexandre Dulaunoy 235e43dbc2 Fix: the JSON schema regarding the related event from Array -> Object 2016-10-07 10:52:59 +02:00
Iglocska ca3d32accb fix: Added some missing entries to gitignore 2016-10-07 09:47:23 +02:00
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 4a129d10e5 Merge branch 'taginfo' into 2.4 2016-10-04 15:56:48 +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
Andras Iklody b6bc5b5522 Merge pull request #1595 from RichieB2B/ncsc-nl/stix-fix 
Fix STIX XML and JSON exports
 2016-10-03 16:50:05 +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
Alexandre Dulaunoy d072afb8da Merge branch '2.4' of github.com:MISP/MISP into 2.4 2016-10-01 20:17:01 +02:00
Alexandre Dulaunoy be429489c9 MISP rfc repository added 2016-10-01 20:16:33 +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 b68627c93b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-09-30 17:27:10 +02:00
Iglocska a706e5c59d fix: Added the git commit ID to the feed request 2016-09-30 17:26:12 +02:00
Andras Iklody 616b05d17e Merge pull request #1591 from thomai/patch-2 
sudo is needed to create new ssl key.
 2016-09-30 17:25:41 +02:00