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

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
martin 2011-03-03 20:14:07 -05:00
commit 25237087a2
13 changed files with 37 additions and 1131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/ApiController.php
View file

@ -31,7 +31,7 @@ class ApiController extends Zend_Controller_Action
print 'You are not allowed to access this resource.';
exit;
}
$jsonStr = json_encode(array("version"=>CAMPCASTER_VERSION));
$jsonStr = json_encode(array("version"=>AIRTIME_VERSION));
echo $jsonStr;
}

3
application/controllers/LoginController.php
View file

@ -61,7 +61,8 @@ class LoginController extends Zend_Controller_Action
$this->view->message = $message;
$this->view->form = $form;
$this->view->airtimeVersion = AIRTIME_VERSION;
$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
}
public function logoutAction()