Thomas Gelf 12b57c6d95 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 ...

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	modules/monitoring/library/Monitoring/Controller.php

2014-05-20 23:15:11 +00:00

..

Comment.php

More comment query cleanup and fix a typo

2014-03-09 20:05:59 +01:00

Contact.php

Add filter functionality to eventhistory view and fix default order direction

2014-02-21 12:59:32 +01:00

Contactgroup.php

Allow to sort contact groups by alias name

2014-02-21 14:04:39 +00:00

Customvar.php

Rename Icinga 2 Web to Icinga Web 2

2013-10-23 15:11:06 +02:00

DataView.php

Data\BaseQuery: rename to Data\SimpleQuery

2014-05-07 11:55:35 +00:00

Downtime.php

Fix downtime scheduled start/end sort error

2014-03-09 22:35:33 +01:00

EventHistory.php

Add filter functionality to eventhistory view and fix default order direction

2014-02-21 12:59:32 +01:00

Groupsummary.php

Added missing columns to the groupsummary queries

2014-02-21 14:03:49 +00:00

Hostgroup.php

Data views: Rename getTableName() to getQueryName()

2014-04-17 13:59:11 +02:00

HostStatus.php

Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018

2014-05-20 23:15:11 +00:00

Notification.php

Rename Icinga 2 Web to Icinga Web 2

2013-10-23 15:11:06 +02:00

Programstatus.php

Rename Icinga 2 Web to Icinga Web 2

2013-10-23 15:11:06 +02:00

Runtimesummary.php

Rename Icinga 2 Web to Icinga Web 2

2013-10-23 15:11:06 +02:00

Runtimevariables.php

Rename Icinga 2 Web to Icinga Web 2

2013-10-23 15:11:06 +02:00

Servicegroup.php

Data views: Rename getTableName() to getQueryName()

2014-04-17 13:59:11 +02:00

ServiceStatus.php

Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018

2014-05-20 23:15:11 +00:00

StateHistorySummary.php

Quick & dirty proposal for new grouped history overviews

2014-02-21 14:05:28 +00:00

StatusSummary.php

Change the way how boxed status information is presented to the user

2014-03-07 16:43:41 +01:00