Albert Santoni d0bd4bfe81 Merge branch 'saas' into saas-store-file-size-and-hash-in-db ... Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php		2015-02-18 19:29:45 -05:00
..
cloud_storage	SAAS-596: Store file size and hash in database	2015-02-17 14:51:51 -05:00
common	Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization	2015-02-18 17:18:43 -05:00
configs	Fixed incorrect authorization for ShowImage API	2015-02-18 18:34:52 -05:00
controllers	Merge branch 'saas-file-sanitization' into saas	2015-02-18 17:19:26 -05:00
forms	Merge branch 'cc-5709-airtime-analyzer' into saas	2015-02-18 16:42:04 -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	Merge branch '2.5.x' into saas	2015-02-02 18:03:39 -05:00
models	SAAS-596: Store file size and hash in database	2015-02-17 16:51:25 -05:00
modules/rest	Fixed incorrect authorization for ShowImage API	2015-02-18 18:34:52 -05:00
services	SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful	2015-02-04 15:09:27 -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	Fixed the unit tests: Ensure key in $_SERVER exists.	2015-02-18 17:03:16 -05:00