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

5228 Commits (31b6ffd625f06961f4802775da684e117720213c)

Author SHA1 Message Date
Richard van den Berg 7687341ada Make threatlevel in E-mail subject optional 2016-12-16 17:17:20 +01:00
iglocska 79ad18f6f3 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-16 16:44:49 +01:00
iglocska f708ea53a7 fix: Added exception for site admins to be able to add galaxies to events of other users 2016-12-16 16:44:22 +01:00
iglocska 6778d0dad5 new: Added a way to disable certain tags from the UI, fixes #1733 
- also added a new setting to set the default posture when an event containing a tag is pushed (via the API/sync/etc)
  - new setting allows to automatically set new tags to hidden

- the hidden setting only hides the tags from the tag selection when tagging an event
 2016-12-16 15:44:10 +01:00
iglocska 3ce7715f17 some fixes and pre-validation modifications 2016-12-16 00:02:19 +01:00
iglocska bc6d9b29c7 new: First iteration of the new types 2016-12-15 23:43:03 +01:00
Andras Iklody 39a94d2c88 Merge pull request #1767 from RichieB2B/ncsc-nl/backupdir 
Don't let misp-backup.sh fill up /tmp
 2016-12-15 20:01:44 +01:00
Andras Iklody b8c8739336 Merge pull request #1766 from RichieB2B/ncsc-nl/speedup 
Speed up MISP by factor 10
 2016-12-15 20:00:42 +01:00
Richard van den Berg 508239f275 Use OutputDirName for temporary storage 2016-12-15 18:57:02 +01:00
Richard van den Berg 50f684d1c5 Add missing indexes 2016-12-15 18:38:51 +01:00
iglocska 56d08e7dfc Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-14 17:20:48 +01:00
iglocska ffc65ad17b chg: Rework of the galaxy UI, fixes #1738 
- Reworked the UI elements to allow for more convenient pivoting between event index/event view/galaxy pages
- Reworked the galaxy quick view on the event view
- country flags added to the country fields
- added authors to the clusters
- tightened the access control to not show non-working buttons for users that don't have tagging rights
 2016-12-14 17:18:09 +01:00
Andras Iklody 73af5c9d63 Merge pull request #1760 from moshekaplan/patch-2 
Update xINSTALL.centos7.txt
 2016-12-14 15:08:22 +01:00
Moshe Kaplan c895f898c3 Update xINSTALL.centos7.txt 2016-12-14 08:24:14 -05:00
Iglocska cd2a9185bc Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-13 20:51:01 +01:00
Iglocska 7a0f0c4aec chg: Changed the event download as filename to misp.event.id.uuid.format, fixes #1515 2016-12-13 20:50:18 +01:00
Alexandre Dulaunoy fc23b0611d fix: galaxy updated to the latest version 2016-12-13 19:52:08 +01:00
Andras Iklody f1e9eea670 Merge pull request #1757 from RichieB2B/ncsc-nl/24h-sighting 
Use 24 hour clock
 2016-12-13 14:48:40 +01:00
Richard van den Berg 860dd8b686 Use 24 hour clock 2016-12-13 13:59:11 +01:00
Andras Iklody 4c02755845 Merge pull request #1755 from RichieB2B/ncsc-nl/fulltext 
Add fulltext indexes from AppModel.php to MYSQL.sql
 2016-12-13 10:44:37 +01:00
Richard van den Berg 9d89516e58 Add fulltext indexes from AppModel.php to MYSQL.sql 2016-12-13 10:34:29 +01:00
Andras Iklody 2e7ec7d25e Merge pull request #1754 from moshekaplan/patch-1 
Update xINSTALL.centos7.txt
 2016-12-12 20:02:02 +01:00
Moshe Kaplan 4957edcd22 Update xINSTALL.centos7.txt 2016-12-12 13:24:27 -05:00
iglocska 4155e32629 fix: Added additional refanging patterns to the complex type tool, fixes #470 2016-12-12 14:20:07 +01:00
iglocska aaaaaa0523 fix: Better validation of links, fixes #1745 
- move to the built in url validation instead of the regex we used before
 2016-12-12 10:00:44 +01:00
iglocska b0837fd24f Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-12 01:35:48 +01:00
iglocska f1fd688d9b chg: Added missing description field and ordered galaxy fields, fixes #1744 2016-12-12 01:35:04 +01:00
iglocska 8f4f1d2b46 fix: Fixed several issues with the template file uploads, fixes #1743 
- Bug with uploading attachments as described in the issue
  - move from pass by reference for a loop was still lacking the correct selector to update the array element instead of the loop's copy
  - attachment uploader tried to base64 the file-name instead of the file-data and store it as the attachment

- Fix to an unrelated bug that didn't encrypt malicious files when going through the template uploader
 2016-12-11 22:00:05 +01:00
iglocska f8ddffd281 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-10 14:24:53 +01:00
iglocska 5ea6c4ba87 fix: Issue with new installations not correctly setting the default password for the initial user 2016-12-10 14:22:58 +01:00
Alexandre Dulaunoy d2c1161237 fix: MISP galaxy updated to the latest version 2016-12-10 12:09:59 +01:00
iglocska bf1bbf9640 fix: Fixed an invalid link used when pivoting from galaxies to clusters in the add cluster flow 2016-12-09 14:03:58 +01:00
iglocska c02554fd45 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-09 10:56:34 +01:00
iglocska 39d2f6d12f fix: Fixed an issue with the warninglist detection 2016-12-09 10:56:16 +01:00
Andras Iklody 845c1c8495 Merge pull request #1742 from RichieB2B/ncsc-nl/proposal_to_delete 
Set proposal_to_delete default to 0
 2016-12-09 10:06:43 +01:00
Richard van den Berg e8ce32f0a2 Set proposal_to_delete default to 0 2016-12-09 09:54:08 +01:00
iglocska 4801b47a8a fix: On newer MySQL versions proposing a deletion to an attribute failed, fixes #1741 2016-12-09 09:26:58 +01:00
iglocska 01f078344c fix: Fixed an issue with the freetext importer 
- It looks like PHP does parse single quoted strings and replaces double backslashes with a single literal backslash
 2016-12-09 08:59:59 +01:00
iglocska 2c30c1787d fix: Fixes the missing default for the descriptions of galaxy clusters 2016-12-09 07:58:03 +01:00
iglocska 6fe3c49060 fix: Fixes MySQL 5.7 group by issues 2016-12-09 07:57:19 +01:00
Iglocska b653a2aab1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-08 10:47:49 +01:00
Iglocska a95178602b fix: Pivot to the filtered event index from the event view using the selected cluster as a filter, affects #1731 2016-12-08 10:40:25 +01:00
Iglocska bfc8b65f0d fix: Galaxy permission issue fixes #1 
- affects #1731
 2016-12-08 10:30:29 +01:00
Andras Iklody 00e16047e9 Merge pull request #1728 from RichieB2B/ncsc-nl/backup 
Some adjustments to misp-backup.sh:
 2016-12-07 23:59:03 +01:00
Richard van den Berg 386440deb3 Some adjustments to misp-backup.sh: 
- allow setting MISPPath in misp-backup.conf
- use MySQL username/password from database.php by default
- use machine sortable date for output file
- do not store TmdDir name in tar
- use tar non-verbosely
 2016-12-07 21:47:20 +01:00
Raphaël Vinot 88a25e6764 Merge pull request #1722 from MISP/travis 
up: Run tests in python3
 2016-12-07 18:11:21 +01:00
Andras Iklody d63132ad6c Merge pull request #1727 from kirzaks/2.4 
Snort optimisation
 2016-12-07 17:24:01 +01:00
Armins 7ba143bcd1 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-12-07 18:12:49 +02:00
Armins 4c67f0a2c8 Added fast_pattern 2016-12-07 18:07:12 +02:00
Iglocska 0453387bf8 Merge branch 'syntax' into 2.4 2016-12-07 16:55:56 +01:00