Iglocska 704880ce59 Merge branch 'master' into feature/sg ... Conflicts: VERSION.json app/Controller/AttributesController.php app/Controller/EventsController.php app/Model/Attribute.php app/Model/Event.php app/Model/Server.php		2015-08-30 13:29:05 +02:00
..
Upgrade_21_to_22	Documentation changes	2014-10-07 23:21:48 +02:00
build/technical_design	Some minor changes	2014-01-09 17:13:07 +01:00
format	Version 1.0 of MISP XML Document Type Definition.	2013-07-29 11:37:09 +02:00
logos	MISP diagrams in SVG licensed under CC-BY-SA added	2015-04-24 08:47:18 +02:00
setup	Merge branch 'hotfix-2.2.40' into develop	2014-09-12 13:33:55 +02:00
INSTALL.centos6.txt	Updated the documentation to reflect the correct STIX / CyBox versions required	2015-06-10 12:47:00 +02:00
INSTALL.centos7.txt	Updated the documentation to reflect the correct STIX / CyBox versions required	2015-06-10 12:47:00 +02:00
INSTALL.sysop.txt	updated structure of the documentation	2013-02-15 08:20:14 +01:00
INSTALL.ubuntu1404.txt	Merge pull request #577 from bemre/patch-1	2015-08-26 11:29:14 +02:00
MYSQL.sql	Merge branch 'master' into feature/sg	2015-08-30 13:29:05 +02:00
UPDATE.txt	Removed git pull (x2) since we are already doing checkout	2015-08-25 00:17:19 +02:00
UPGRADE.txt	Updated the documentation to reflect the correct STIX / CyBox versions required	2015-06-10 12:47:00 +02:00
apache.misp	Changes to the installation	2014-10-20 14:44:03 +02:00
apache.misp.ssl	Changes to the installation	2014-10-20 14:44:03 +02:00
documentation.pdf	New documentation left off	2015-02-05 10:14:27 +01:00
get-misp-automation.py	Example file on how to get the exported IDS data from MISP	2015-03-15 02:20:50 +01:00
upgrade_2.3.sql	Fixed an issue with log entries being truncated (Requires administrator action!)	2015-06-05 15:24:26 +02:00
upgrade_2.4.sql	Initial commit	2015-02-23 11:33:38 +01:00