[icinga-checkins] icinga.org: icinga-web/master: Merge branch 'master' of git://git.icinga. org/icinga-web

git at icinga.org git at icinga.org
Fri Oct 19 12:19:58 CEST 2012


Module: icinga-web
Branch: master
Commit: 66ffbfc2e0799597bf5d168e6bd0b42b02f7a7fb
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=66ffbfc2e0799597bf5d168e6bd0b42b02f7a7fb

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 15 13:57:38 2012 +0200

Merge branch 'master' of git://git.icinga.org/icinga-web

Conflicts:
	pub/styles/icinga.css

---

 app/modules/Api/config/views/host.xml              |   17 +-
 app/modules/Api/config/views/misc.xml              |    2 +-
 app/modules/Api/config/views/notifications.xml     |   12 +-
 app/modules/Api/config/views/service.xml           |    4 +-
 .../Cronks/data/xml/grid/icinga-host-template.xml  |    6 +-
 .../xml/grid/icinga-open-problems-template.xml     |  222 ++++++++++++++------
 .../Cronks/lib/js/Cronk/grid/MetaGridPanel.js      |    1 +
 .../Cronks/lib/js/Cronk/grid/handler/URL.js        |    5 +-
 .../templateExtensions/pnp-host-extension.xml      |    2 +-
 .../templateExtensions/pnp-service-extension.xml   |    2 +-
 doc/THANKS                                         |    1 +
 etc/schema/mysql.sql                               |   21 ++-
 pub/styles/icinga.css                              |    7 +-
 13 files changed, 206 insertions(+), 96 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=66ffbfc2e0799597bf5d168e6bd0b42b02f7a7fb




More information about the icinga-checkins mailing list