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

3284 Commits (a69364f7866c201c696b2b16cdb081241b521ee6)

Author SHA1 Message Date
Iglocska a69364f786 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-02 17:54:11 +01:00
Iglocska 85ae360324 Fix to the e-mail contents of the contact message 2016-02-02 17:53:30 +01:00
Andras Iklody 65c18d2cdc Merge pull request #904 from deralexxx/patch-5 
Comment a line that includes a comment
 2016-02-02 17:38:12 +01:00
Alexander J f46262ff2f Update INSTALL.ubuntu1404.txt 2016-02-02 17:30:55 +01:00
Alexander J 07487264e9 Update INSTALL.ubuntu1404.txt 2016-02-02 17:29:08 +01:00
Iglocska af57c7fe62 Version bump 2016-02-02 15:32:02 +01:00
Iglocska 051dd6cc3b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-02 15:31:39 +01:00
Iglocska d6c0b6d853 Fixes to several permission issues with the e-mailer 
- contact e-mail recipients were incorrectly set resulting in the e-mails landing at the wrong recipient
- disabled users were not excluded from certain e-mails
 2016-02-02 15:30:23 +01:00
Andras Iklody 45463a31c9 Merge pull request #903 from deralexxx/patch-4 
Create INSTALL.debian.txt
 2016-02-02 14:53:26 +01:00
Alexander J f00da2be3d Create INSTALL.debian.txt 
I know there is already an ubuntu document, but still I found value to have it being mentioned that debian is supported as well

(There are also some minor changes to the ubuntu docu, would adjust the ubuntu doc as well)
 2016-02-02 14:51:11 +01:00
Iglocska 23b091755d Version bump 2016-02-02 09:37:48 +01:00
Iglocska bd27545418 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-02 09:37:32 +01:00
Iglocska 97533ab272 Major speed boost to the correlation 
- it seems that for some reason some conditions in the correlation lookup massacred the performance of the correlation
- doing that additional filter on a PHP level fixes it for now, but it would be interesting to investigate this further and potentially reuse the findings to improve other queries

- also fixed an issue with the indexing script failing on some fulltext fields if it has to fall back to regular indeces.
 2016-02-02 09:35:14 +01:00
Andras Iklody 460c6e52c6 Merge pull request #897 from koenigswinter/2.4 
Update INSTALL.ubuntu1404.txt
 2016-02-01 23:34:10 +01:00
Heiko Siebel 38804da49f Update INSTALL.ubuntu1404.txt 
30: + gnupg-agent (apt-get install)
178: - su www-data -c 'bash /var/www/MISP/app/Console/worker/start.sh', + sudo -u www-data bash /var/www/MISP/app/Console/worker/start.sh (default Ubuntu installation fails to start the workers after a reboot --> "www-data" has no shell in "/etc/passwd").
220: + pip install redis
 2016-02-01 23:26:43 +01:00
Iglocska 7f97a49b45 Reverted the automation change 2016-02-01 15:16:32 +01:00
Iglocska 5074ee948f Merge branch 'update_script' into 2.4 2016-02-01 15:13:55 +01:00
Iglocska 6a4d191454 Left off a view for the org merge tool 2016-02-01 15:11:59 +01:00
Iglocska 9c6ed17a4d Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-02-01 15:11:32 +01:00
Iglocska 375a66220e Made the background workers baseline, should make the installation a bit easier 2016-02-01 15:10:45 +01:00
AaronK f33f7feaa7 Merge pull request #1 from aaronkaplan/aaronkaplan-patch-1 
Update UPDATE.txt
 2016-02-01 13:49:20 +01:00
AaronK 22b6bdd725 Update UPDATE.txt 
permissions: it's enough to chown -R www-data /var/www/MISP
 2016-02-01 13:49:04 +01:00
aaronkaplan 3ca4bf96e0 Merge branch 'master' of https://github.com/MISP/MISP 2016-02-01 12:15:01 +01:00
Alexandre Dulaunoy 1736bb4e99 Merge pull request #894 from deralexxx/patch-3 
Update INSTALL.ubuntu1404.txt
 2016-01-31 18:43:18 +01:00
Iglocska 3560b3bc06 Fix to the initial version of the correlation on the event index 
- also removed an expensive lookup of sharing group permissions required for event views utilising the pagination from being run on actions that do not make use of it
 2016-01-31 00:32:17 +01:00
Iglocska 12e32d4673 Correlations on the event index, first implementation 2016-01-30 19:26:47 +01:00
Iglocska 9c8719bf58 Display and Search for model ID in the audit logs, fixes #889 2016-01-29 15:48:23 +01:00
Alexander J 5ad2434db6 Update INSTALL.ubuntu1404.txt 
change base url should be not optional but required for every installation to be changed
 2016-01-29 15:33:27 +01:00
Iglocska 0357ec2558 Version bump 2016-01-29 14:32:41 +01:00
Iglocska f42ae2cf0f Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-29 14:29:12 +01:00
Iglocska 2566d49278 Fix to the Proposal alerts not going out to users after one has failed 2016-01-29 14:28:42 +01:00
Alexandre Dulaunoy 5524def34f Merge pull request #893 from deralexxx/patch-2 
mention install howto in Documentation part
 2016-01-29 13:57:34 +01:00
Alexander J b9db1494cb mention install howto in Documentation part 
Spent some minutes to find the documentation how tot install MISP (and it is not mentioned in the PDF btw)
 2016-01-29 13:55:26 +01:00
Iglocska d3d2c8a46f Flash message if the current user can accept/discard proposals on the currently viewed event 2016-01-28 15:40:32 +01:00
Iglocska 9580583b8a Fix to the download as... -> CSV export 
- incorrect parameter passed blocked CSVs from being exported when non IDS worthy attributes were meant to be included
 2016-01-28 13:58:35 +01:00
Iglocska 7b3d2af8c4 Reverted the header change, added note in app/Config/email on how to enable it 
- otherwise it might break custom e-mail configurations
 2016-01-28 13:13:15 +01:00
Iglocska e12e0a018d Fix for the previous header issue 2016-01-28 13:05:22 +01:00
Iglocska 8799d6a745 Attempt to fix the returnPath issue 
- it looks like PHP is overriding the setting
 2016-01-28 11:36:15 +01:00
Iglocska e827d1044d Set the returnPath header in e-mails correctly 2016-01-28 11:16:49 +01:00
Iglocska 9df5c7703b Version bump 2016-01-28 10:22:37 +01:00
Iglocska 1362cf40b7 Added org merge tool 
- allows a site admin to merge all objects belonging to an organisation into another
  - this can be useful if duplicate organisations exist for example
  - the tool overrides the built in mechanism and should only be used if absolutely required
  - at the end of the process the original organisation is removed

- the tool generates 2 files that are dropped in the log directory of MISP
  - 1 contains a JSON with all the changed fields and the IDs
  - 1 contains an SQL script that allows an admin to revert the changes
 2016-01-27 23:59:34 +01:00
Iglocska 430f8ea479 URL fallback when adding users fails for the sync user dropdown 2016-01-26 10:03:46 +01:00
Iglocska 4cb99afa29 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-26 09:55:55 +01:00
Iglocska 543782b6a5 Fixed a bug that caused the "last" parameter in automation to fail 2016-01-26 09:55:27 +01:00
Alexandre Dulaunoy dc67a04305 Fixed typos for organization 2016-01-25 23:41:43 +01:00
Iglocska 3280338205 Added the option to override attribute creation in the freetext import tool for site admins 
- site admins can now choose to create proposals instead of attributes via the freetext import tool via a checkbox
 2016-01-25 02:01:59 +01:00
Iglocska dedc739da5 Added a back button on the tag selection, fixes #845 
- User can now go back to the taxonomy selection when already in the tag select list
 2016-01-25 01:09:33 +01:00
Iglocska 921b42badf Use freetext import tool for proposals, fixes #871 
- Added the ability to use the freetext import tool for proposals
 2016-01-24 21:50:09 +01:00
Iglocska 2b9887cd42 Show event owner in the alert e-mail, fixes #361 2016-01-24 21:17:08 +01:00
Iglocska c2c41b04d3 Fixed an issue with the freetext import 
- url detection would detect any word with a trailing "." as a valid url
  - google. was detected as a url
- this also caused training "."s to be included in valid urls
  - http://www.google.com.
 2016-01-23 20:19:44 +01:00