Albert Santoni 1ddc27bb77 Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/public/index.php		2015-01-27 18:26:39 -05:00
..
cloud_storage	Fixed Amazon S3 Proxy class bug	2015-01-26 16:06:32 -05:00
common	SAAS-562: UpgradeController broken	2015-01-27 12:13:58 -05:00
configs	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
controllers	Merge branch '2.5.x' into saas	2015-01-27 18:26:39 -05:00
forms	Merge branch '2.5.x' into saas	2015-01-26 17:50:18 -05:00
layouts/scripts	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
logging	Refactored the logging class to reduce code, use error levels correctly, and improve performance.	2015-01-27 18:24:13 -05:00
models	Merge branch '2.5.x' into saas	2015-01-27 15:39:40 -05:00
modules/rest	Decouple Billing and S3 cloud storage stuff from Zend	2015-01-26 13:10:10 -05:00
services	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00
upgrade	SAAS-559: Turn off sql notices during upgrade	2015-01-23 16:08:22 -05:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Decouple Billing and S3 cloud storage stuff from Zend	2015-01-26 13:10:10 -05:00
Bootstrap.php	Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas	2015-01-23 11:32:45 -05:00