Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.1.x' into devel

Browse source 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
This commit is contained in:
denise 2012-06-29 10:57:14 -04:00
commit 335dd1516b
40 changed files with 1084 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -41,7 +41,7 @@ class LibraryController extends Zend_Controller_Action
$user = new Application_Model_User($userInfo->id);
//Open a jPlayer window and play the audio clip.
$menu["play"] = array("name"=> "Play", "icon" => "play");
$menu["play"] = array("name"=> "Preview", "icon" => "play");
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));

6
airtime_mvc/application/controllers/LoginController.php
View file

@ -100,6 +100,12 @@ class LoginController extends Zend_Controller_Action
public function passwordRestoreAction()
{
global $CC_CONFIG;
$request = $this->getRequest();
$baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
if (!Application_Model_Preference::GetEnableSystemEmail()) {
$this->_redirect('login');
}