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

31 Commits (0749273e543a96c8590d976e3161a0beb0d029a0)

Author SHA1 Message Date
Richard van den Berg 7687341ada Make threatlevel in E-mail subject optional 2016-12-16 17:17:20 +01:00
Andreas Ziegler 7d0a6e6e82 chg: better readability of config files 2016-08-23 04:22:35 +02:00
ppanero d03ede615b SSO plugin (Shibboleth based). Instructions to enable and configure it are present in the app/Plugin/ShibbAuth/README.md 2016-08-04 16:34:09 +02:00
Cristian Bell 4f169a8ffa fix: Remove the default defined salt #625 2016-07-20 11:17:23 +02:00
Alexandre Dulaunoy 3b648330ee Fix #1272 2016-06-16 11:38:41 +02:00
Richard van den Berg 15b83aa052 Fix spaces 2016-06-07 11:39:40 +02:00
Richard van den Berg 8b725d47ec Add CertAuth.userDefaults example 2016-06-07 11:38:50 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andras Iklody 2f97cc8cb4 Merge pull request #1137 from rotanid/bugfix-pr-976-kerberos 
improve quality of PR#976 (kerberos auth)
 2016-05-19 08:24:18 +02:00
Andreas Ziegler a2c53292b6 config.default.php: fix tiny typo 2016-05-19 03:47:43 +02:00
Andreas Ziegler 800721bf2f improve quality of PR#976 (kerberos auth) 2016-05-19 03:41:10 +02:00
Iglocska 8db889ce7e SMIME changes 
- tied into auto upgrade system
- tied into server settings
- some cleanup of overly verbose debug
- Enforcing enable/disable everywhere
- Changed temporary file structure
 2016-04-26 16:40:12 +02:00
Iglocska 267caa3315 Merge branch '2.4' into smime 
Conflicts:
	app/Controller/AppController.php
 2016-04-25 23:12:57 +02:00
Iglocska 724c13fe23 Added warning 
- to be removed once we do some testing
 2016-04-18 17:28:00 +02:00
devnull- 26036ea3fa Update the config.default.php with the SMIME section 2016-04-04 19:35:10 +02:00
Tristan METAYER e8eb42755b add modification for erreur with ldap user 
modification for dc in conf file
 2016-03-17 09:12:23 +01:00
trucky dev 8cb32887e0 Add kerberos Authentification fonction 2016-02-24 23:33:06 +01:00
Iglocska 24261dd6f3 Some changes to the default config file 2016-01-18 15:53:19 +01:00
Iglocska eeb3dcc69b Replaced the footer text 
- added link to the github page of MISP
- made the text "Powered by MISP vversion_number" fixed
- Replaced the surrounding text fields with two new fields (empty by default)
 2016-01-17 21:22:50 +01:00
Iglocska 1746c0f902 Replaced encoded copyright sign with the sign itself to avoid the double encoding in the footer, fixes #853 2016-01-16 23:12:10 +01:00
iglocska 9b4974d394 Merge branch 'unencrypted' into hotfix-2.3.69 2015-05-25 10:25:25 +02:00
Guilherme Capilé d2eaccec31 removed session handling from plugin and moved to AppController 2015-04-28 11:25:13 -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 06f8a9bbd6 Merge branch 'proxy' into hotfix-2.3.59 2015-04-08 22:36:13 +02:00
Richard van den Berg 9e7ea8fe74 Add proxy support to SyncTool 2015-03-19 10:03:25 +01:00
Richard van den Berg 12dc5b6579 Make unpublished events private if MISP.unpublishedprivate == true 2015-02-05 17:16:40 +01:00
Richard van den Berg 886d36438e Do not send details of events unencrypted 2015-01-27 09:26:25 +01:00
iglocska eac25e3d3a Added the option to take ownership of an event uploaded via the Add MISP XML button 
- server setting has to be enabled to allow for this
- can cause issues if the event gets synchronised with an instance that has a different creator organisation for the same event
- it is recommended not to use this, but in some cases it can be very helpful - the setting for it in the configuration is called MISP.take_ownership_xml_import
 2014-09-15 12:30:26 +02:00
iglocska b178358f2a Default config.php added 2014-09-10 11:48:48 +02:00