Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/hostgroups.phtml modules/monitoring/application/views/scripts/process/info.phtml modules/monitoring/application/views/scripts/show/components/downtime.phtml modules/monitoring/application/views/scripts/show/components/notifications.phtml modules/monitoring/public/css/module.less		2015-05-21 14:57:01 +02:00
..
behavior	Only use JS tooltips when non-native tooltip behavior is required	2015-04-20 11:21:10 +02:00
eventlistener.js	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
events.js	Revert "Abort pending AJAX requests before page unload"	2015-05-19 17:06:22 +02:00
history.js	Fix that the detail URL is no longer appended to the redirect URL on login	2015-03-13 03:48:46 +01:00
loader.js	Revert "Abort pending AJAX requests before page unload"	2015-05-19 17:06:22 +02:00
logger.js	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
module.js	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
timer.js	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
timezone.js	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
ui.js	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
utils.js	js: no console.log. please!	2015-02-09 15:26:55 +01:00