tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
icingaweb2/public
History
Jannis Moßhammer b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179 
Conflicts:
	application/layouts/scripts/layout.phtml
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/contacts.phtml
	modules/monitoring/application/views/scripts/show/components/customvars.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
 		2013-07-12 15:55:31 +02:00
..
css Add Host detail to hostoverview 2013-07-12 15:12:26 +02:00
img Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
js Host detail view 2013-07-08 16:12:47 +02:00
.htaccess phtml: Use short_open_tags instead of <?php echo 2013-07-10 17:03:51 +02:00
apple-touch-icon-57x57-precomposed.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
apple-touch-icon-72x72-precomposed.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
apple-touch-icon-114x114-precomposed.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
apple-touch-icon-144x144-precomposed.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
apple-touch-icon-precomposed.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
apple-touch-icon.png Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
css.php Host list markup and less changes (WIP) 2013-07-12 14:14:32 +02:00
favicon.ico Test and move bootstrapping/web code to source tree 2013-06-17 08:49:27 +02:00
index.php Host list markup and less changes (WIP) 2013-07-12 14:14:32 +02:00
index.php.in Add Autoconf based installation with most parameters 2013-07-03 14:05:59 +02:00
public Host list markup and less changes (WIP) 2013-07-12 14:14:32 +02:00