Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458 ... Conflicts: application/views/scripts/config/application.phtml application/views/scripts/config/module.phtml application/views/scripts/config/modules.phtml library/Icinga/Web/Widget/Dashboard/Dashlet.php modules/monitoring/application/controllers/TimelineController.php		2015-02-24 08:42:36 +01:00
..
alertsummary	Header: Add to alert summary	2015-02-23 12:20:45 +01:00
chart	Add logarithmic AxisUnit	2015-01-13 17:56:50 +01:00
config	Mute all icons that are part of an anchor and add simple labels to such anchors	2015-02-16 11:02:09 +01:00
host	Header: Add h1 to host/show component	2015-02-23 15:13:18 +01:00
hosts	Add proper titles to the host multi selection view	2015-02-23 17:22:07 +01:00
list	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
partials	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
process	Header: Remove skiplinks	2015-02-23 11:18:58 +01:00
service	Use the new object-view scripts	2015-02-02 16:28:35 +01:00
services	Add proper titles to service multi selection view	2015-02-23 17:29:50 +01:00
show	Add proper titles to the history view	2015-02-23 17:30:51 +01:00
tactical	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
timeline	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00