Albert Santoni ab6d83f49d Merge branch 'saas' into saas-media-refactor ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/modules/rest/controllers/MediaController.php		2015-02-26 13:10:13 -05:00
..
cloud_storage	Merge branch 'saas' into saas-media-refactor	2015-02-25 13:02:11 -05:00
common	Airtime Pro SSL compatibility hack	2015-02-25 16:19:01 -05:00
configs	Added check to hide LiveChat for existing hobbyist users	2015-02-26 12:49:52 -05:00
controllers	Merge branch 'saas' into saas-media-refactor	2015-02-26 13:10:13 -05:00
forms	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-02-24 11:16:19 -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	Merge branch 'saas' into saas-media-refactor	2015-02-26 13:10:13 -05:00
modules/rest	Also need to diable disk usage in media controller	2015-02-25 16:11:52 -05:00
services	Fixed download URLs for non-cloud files	2015-02-26 11:29:08 -05:00
upgrade	SAAS-596: Store file size and hash in database	2015-02-19 16:27:50 -05:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas	2015-02-24 15:03:06 -05:00
Bootstrap.php	Merge branch 'saas' into saas-media-refactor	2015-02-26 13:10:13 -05:00