Commit Graph

4 Commits

Author SHA1 Message Date
Thomas Gelf 57caacb93f Merge branch 'feature/fanzzzy-5481' into feature/master-1
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ErrorController.php
	application/views/scripts/authentication/login.phtml
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Web/Controller/ActionController.php
	library/Icinga/Web/Hook.php
	library/Icinga/Web/Widget/Dashboard.php
2014-03-04 09:42:25 +00:00
Thomas Gelf b6dbfaa6b8 Add image size support to parsedown 2014-02-21 14:03:47 +00:00
Eric Lippmann c5f016b220 Fix executable flags on normal files
fixes #5040
2014-02-18 09:49:40 +01:00
Eric Lippmann fa861c2c85 Replace Mitchelf/Markdown with Parsedown
fixes #5518
2014-01-22 14:04:55 +01:00