Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
commit
c4053a1b38
6 changed files with 169 additions and 114 deletions
|
@ -175,8 +175,9 @@ class ScheduleController extends Zend_Controller_Action
|
|||
}
|
||||
}
|
||||
|
||||
public function getSchedulerTimeAction()
|
||||
public function viewPlaylistAction()
|
||||
{
|
||||
$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
|
||||
$this->view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript');
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue