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
..
authentication	Mute icons properly using the new automatic mechanisms of our view helpers	2015-02-16 10:52:42 +01:00
config	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
dashboard	Add proper titles to the dashboard configuration's links	2015-02-23 17:20:26 +01:00
error	Error Controller: Move close tab creation to template	2015-02-02 12:08:20 +01:00
filter	Implement Filter to IDO Sql parser	2013-10-17 19:52:25 +02:00
form	Fix that the authentication reorder form does not have an action	2015-02-16 15:08:27 +01:00
index	Autorefresh: should work also on initial page load	2014-06-21 01:54:32 +02:00
layout	Menu: Add html5 nav element to menu	2015-02-12 13:14:01 +01:00
list	Application log: don't crash if logData === null	2014-09-03 12:44:23 +02:00
preference	Header: Adapt preference dialog	2015-02-13 16:12:34 +01:00
roles	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
search	Implement modules self provided search configuration	2014-09-04 16:31:10 +02:00
inline.phtml	Template cleanup and validation part 1	2013-08-23 10:27:16 +02:00
joystickPagination.phtml	Add proper titles to the joystick navigation	2015-02-23 17:21:12 +01:00
mixedPagination.phtml	Add proper titles to the mixed pagination	2015-02-23 17:21:31 +01:00
pivottablePagination.phtml	PivottablePagination view script: show axis type (x/y) in titles	2014-12-19 17:23:11 +01:00
showConfiguration.phtml	config forms: prepend our custom view decorator when saving the configuration failed	2014-11-04 14:48:24 +01:00