MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
20,889 Commits
34 Branches
365 Tags
189 MiB
Commit Graph

75 Commits (741a74165efb415c744bfad7f7e8a4403113247a)

Author SHA1 Message Date
Christophe Vandeplas e3ed847ba0 fixing some REST API and XML issues 2013-05-28 11:15:21 +02:00
Christophe Vandeplas 0614db919e fixes information leakage vulnerability on REST XML outputs 2013-05-22 10:52:03 +02:00
Andras Iklody 2288a18603 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-17 08:47:18 +02:00
Christophe Vandeplas 2ff9af3164 fix merge issue 2013-04-16 17:04:48 +02:00
Christophe Vandeplas 60378a076b Merge branch 'master' of https://github.com/MISP/MISP.git 2013-04-16 16:59:47 +02:00
Christophe Vandeplas 8029d7fa29 removes multiple correlation engines Fixes #83 but after testing issue 
#95 comes to light
 2013-04-16 16:59:12 +02:00
Andras Iklody 4bd20c5355 Merge branch 'master' of https://github.com/MISP/MISP 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-16 16:18:57 +02:00
Andras Iklody 9a1bb61ed5 Small fixes 
- Comments about isAdmin vs isSiteAdmin

- Extra config line added to bootstrap.default.php for the built in e-mail
  system
 2013-04-16 15:55:33 +02:00
Andras Iklody 3d2d752d3f Small fix 2013-04-16 15:54:24 +02:00
Andras Iklody 6fc5b63fb9 Small changes 
- added an optional field to the bootstrap default (used by the e-mail
  notification system)

- Clarification about the isAdmin and isSiteAdmin (comment)
 2013-04-16 15:52:19 +02:00
Christophe Vandeplas 8d5782125d removed unused CyDefSIG.showowner field. Closes issue #93 2013-04-16 15:29:34 +02:00
iglocska 54c02dc218 Update to the default config files 
- Some minor changes to the default config files
 2013-03-18 13:38:52 +01:00
Noud de Brouwer ce44cdb529 coding standards 
this is to the new php53-pear-CakePHP_CodeSniffer-0.1.11.
 2013-02-15 14:20:03 +00:00
Noud de Brouwer ce430a2005 coding standards 
Coding Standards.
 2013-01-28 08:43:44 +00:00
Noud de Brouwer a6371f5ad8 coding standards 
Coding Standards.
 2013-01-28 08:32:01 +00:00
noud 2903493205 Merge branch 'master' into develop 
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
 2012-12-13 16:03:35 +01:00
noud 276cb5df10 RESTfull sync 
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)

both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
 2012-12-13 15:52:00 +01:00
noud c260730a3d correlation 
CyDefSIG.correlation being 'default' and 'sql' are depreciated.
 2012-11-21 13:20:08 +01:00
noud 2a12a5db3e dns 
config if there is a name server available and do not use if not there.
 2012-11-16 11:22:19 +01:00
noud e8a7b6e0fe hostname & port 
if no baseurl given in bootstrap.php use the server configuration.
 2012-11-15 08:36:42 +01:00
noud 49a21bf6a5 version 
show version in footer and only when logged in.
 2012-10-31 16:52:27 +01:00
noud 67e50cb612 Private 
Private events are true private and
running a server in 2 modes (private and sync),
so real private (red) or private to server (amber)
or full distributable (green).

Mind this needs a change to tables events, attributes and correlation.
These are in MYSQL.private.sql.
 2012-10-17 14:45:26 +02:00
noud aea3aa5934 xxx.default.php 
put plugins loading into bootstrap.default.php
 2012-10-10 11:43:04 +02:00
Andrzej Dereszowski 0a5d506847 Merge branch 'master' of ssh://misp.ncirc.nato.int:55555/home/git/cydefsig 2012-10-09 14:49:41 +02:00
Andrzej Dereszowski c90ec416f0 Configuration files renamed to better handle git merges on production systems. 
Please add new features with their default values. Their should contain only example values.

	renamed:    app/Config/bootstrap.php -> app/Config/bootstrap.default.php
	renamed:    app/Config/core.php -> app/Config/core.default.php
	renamed:    app/Config/database.php -> app/Config/database.default.php
 2012-10-09 14:44:25 +02:00