Commit Graph

2 Commits

Author SHA1 Message Date
Eric Lippmann cde3ec6bc8 Merge branch 'master' into bugfix/commands-6593
Conflicts:
	modules/monitoring/application/controllers/TimelineController.php
2014-09-23 22:54:17 -07:00
Matthias Jentsch dc05b2e933 Transform TimelineIntervalBox into a generic ListBox
Add options to control the changed url parameter and the displayed label to make it usable in generic cases.
2014-09-19 17:41:43 +02:00