libretime/airtime_mvc/public
drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
..
css Added instance description field 2014-09-19 12:55:02 -04:00
images/datatables Removed unnecessary test directory 2014-09-16 18:15:31 -04:00
install CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 11:43:34 -05:00
js Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-03 12:29:58 -05:00
widgets SAAS-436: Fix widgets 2014-05-20 17:43:06 -04:00
.htaccess htaccess changes to make the saas branch run locally 2014-07-07 15:13:27 -04:00
favicon.ico CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
index.php Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-03 12:29:58 -05:00
robots.txt CC-3933: Remove version number and date strings from login page footer, add robots.txt 2012-06-08 10:51:10 -04:00