Iglocska 69c0fd8a57 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4		2016-10-07 09:42:41 +02:00
..
Config	chg: cleanup of old acl system config files that hasn't been used in years	2016-09-14 09:26:13 +02:00
Console	Fix indication of new attributes in E-mail alerts, fixes #1521	2016-10-02 14:46:51 +02:00
Controller	fix: Fixed a bug with the event view	2016-10-06 17:24:42 +02:00
Lib	Revert "fix: missing new TLDs in free text import, solves #1149 (#1574)"	2016-09-27 16:38:35 +02:00
Model	fix: Left off the actual file affected for the last commit	2016-10-06 17:27:43 +02:00
Plugin	default org changed to id instead of name	2016-09-23 14:34:20 +02:00
Test	…
View	fix: Fixed the incorrect column order on the event index	2016-10-06 14:38:09 +02:00
files	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2016-10-07 09:23:20 +02:00
tmp	chg: remove obsolete files	2016-06-06 17:18:26 +02:00
webroot	fix: Added missing changes to the javascript file	2016-10-07 09:42:07 +02:00
.htaccess	Fix permissions	2016-02-11 17:03:51 +01:00
Makefile	…
composer.json	Use composer to install cake resque, remove old dependencies.	2016-06-02 17:28:03 +02:00
index.php	Fix permissions	2016-02-11 17:03:51 +01:00
update_thirdparty.sh	Update bootstrap-timepicker to 0.3.0	2016-06-06 17:25:42 +02:00