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

2285 Commits (b604203f2f027b84ac0619f92a43ed4851ef472b)

Author SHA1 Message Date
iglocska b604203f2f Merge branch 'hotfix-2.3.65' 2015-05-15 09:25:40 +02:00
iglocska 7fb6e2f95e Fixed issue with proxy settings attempted to be added in synctool, even if not set 2015-05-15 09:25:07 +02:00
iglocska 35477b919d Merge branch 'hotfix-2.3.64' into develop 2015-05-13 17:24:21 +02:00
iglocska bc723f57ed Merge branch 'hotfix-2.3.64' 2015-05-13 17:23:57 +02:00
iglocska 88d4a2da83 Merge branch 'certauth' into hotfix-2.3.64 2015-05-13 17:20:15 +02:00
iglocska 99ec766ce3 Merge branch 'cakephppath' into hotfix-2.3.64 2015-05-13 17:10:10 +02:00
iglocska 3ac6c77b37 Merge branch 'saltlength' into hotfix-2.3.64 2015-05-13 17:09:27 +02:00
iglocska de7d467343 Merge branch 'rsakey' into hotfix-2.3.64 2015-05-13 17:07:29 +02:00
iglocska 962a21e3c6 Left off a file 2015-05-13 17:04:09 +02:00
iglocska 0851f44764 PGP key lookup for lazy MISP instance admins, fixes #492 
- Added a button for the add user / edit user views that fetches the entered e-mail addresses pgp key from pgp.mit.edu
 2015-05-13 17:01:56 +02:00
iglocska 35134a7f2e Implemented correct from / to api parameter checks 
- based on stevengoossensB's pull request
 2015-05-13 16:12:06 +02:00
David André 7d3f53e5ac Removed the RSA key recommendation from INSTALL.ubuntu1404.txt 2015-05-12 15:11:43 +02:00
David André 40a3fe5f8b Removed the RSA key recommendation from INSTALL.centos7.txt 2015-05-12 15:10:59 +02:00
David André 91245f7705 Removed the RSA key recommendation from INSTALL.centos6.txt 2015-05-12 15:09:33 +02:00
iglocska 4c0e82e8b1 Merge branch 'password_script' into develop 2015-05-12 11:29:49 +02:00
iglocska c9afc365a8 Merge branch 'password_script' 2015-05-12 11:28:56 +02:00
iglocska 644b0cd512 Password reset fix 2015-05-12 11:28:36 +02:00
Gábor Molnár 62f1e516ce Calrify salt length in INSTALL.md 2015-05-11 12:56:51 +02:00
David André 963646cf6d Added link to GNU AGLP License v3 text 2015-05-11 12:10:02 +02:00
Gábor Molnár 97c1dc95f6 Note salt key length requirement to INSTALL.md 2015-05-11 11:09:04 +02:00
iglocska ecc2fd8ee6 Merge branch 'hotfix-2.3.63' into develop 2015-05-04 19:05:23 +02:00
iglocska ed22d14d6b Merge branch 'hotfix-2.3.63' 2015-05-04 19:03:13 +02:00
iglocska b144831b4d Removed debug 2015-05-04 19:02:50 +02:00
iglocska d9f4e996f2 Parse authorization headers for a valid MISP auth key, fixes #478 
- Keeps parsing until a valid auth key is found
 2015-05-04 19:01:12 +02:00
iglocska e6ac4b0667 Merge branch 'master' into hotfix-2.3.63 2015-05-04 18:52:12 +02:00
remg427 76811250a1 Update UPDATE.txt 
app missing in path for cakephp
 2015-04-28 22:10:08 +02:00
Guilherme Capilé 3055d153f8 minor typo in the unset -- should be ['User']['gpgkey'] 2015-04-28 11:32:20 -03:00
Guilherme Capilé d2eaccec31 removed session handling from plugin and moved to AppController 2015-04-28 11:25:13 -03:00
Guilherme Capilé 7a40b124a8 Merge remote-tracking branch 'upstream/master' 2015-04-28 10:45:17 -03:00
Christophe Vandeplas 0c09d38d55 corrected typo 2015-04-26 20:05:44 +02:00
Christophe Vandeplas f4a26da716 links to website 2015-04-26 20:05:44 +02:00
Alexandre Dulaunoy 915fbcbc82 MISP diagrams in SVG licensed under CC-BY-SA added 2015-04-26 20:05:44 +02:00
Christophe Vandeplas 672b45e292 corrected typo 2015-04-26 20:03:56 +02:00
Christophe Vandeplas d8e7d0c5a4 links to website 2015-04-26 20:01:48 +02:00
Alexandre Dulaunoy e9e589ecad MISP diagrams in SVG licensed under CC-BY-SA added 2015-04-24 08:47:18 +02:00
Andras Iklody 880e1a4839 Merge pull request #468 from elhoim/patch-6 
Fix for #467
 2015-04-20 13:52:32 +02:00
David André d03fecdc59 Fix for #467 
Fix for issue #467
Changed the label of IDS checkbox for proposals
 2015-04-20 13:43:36 +02:00
Guilherme Capilé 9910e03a61 Merge branch 'master' of github.com:FIRSTdotorg/MISP 2015-04-16 22:15:11 -03:00
Guilherme Capilé 6de2541c9a added user defaults to plugin 2015-04-16 22:14:43 -03:00
Guilherme Capilé 9179a2263f Added client SSL certificate authentication as a CakePHP plugin 2015-04-16 22:14:43 -03:00
Guilherme Capilé d0c3b44e34 Added client SSL certificate authentication as a CakePHP plugin 2015-04-16 22:14:43 -03:00
Iglocska 291633a9e3 Merge branch 'hotfix-2.3.62' into develop 2015-04-16 23:18:07 +02:00
Iglocska c3ea6e4915 Merge branch 'hotfix-2.3.62' 2015-04-16 23:17:16 +02:00
Iglocska 699e5a9d17 Small fix to editing an event via the api 
- adding attributes without a uuid will cause the edit to fail
- attributes without a uuid will now be added as a new attribute
 2015-04-16 23:16:15 +02:00
Guilherme Capilé 3224feb25a added user defaults to plugin 2015-04-15 14:02:16 -03:00
Iglocska ae46e9a6e6 Merge branch 'hotfix-2.3.61' into develop 2015-04-14 13:52:39 +02:00
Iglocska 5a0cbff437 Merge branch 'hotfix-2.3.61' 2015-04-14 13:52:24 +02:00
Iglocska e339f0e646 Fixed various issues with the attribute REST api 
- also updated the sample curl scripts
 2015-04-14 13:50:51 +02:00
Iglocska 6472de7f85 Merge branch 'hotfix-2.3.60' into develop 2015-04-13 14:43:28 +02:00
Iglocska 72f8dc0d3d Merge branch 'hotfix-2.3.60' 2015-04-13 14:42:37 +02:00