Albert Santoni 359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas ... Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php		2014-10-29 18:01:31 -04:00
..
common	Merge pull request #76 from RobertElder/saas-relder-cors-localhost	2014-10-29 17:35:25 -04:00
configs	Files auto-updated by Propel	2014-09-16 18:26:18 -04:00
controllers	Wrapped json_encode call in PHP version check	2014-10-28 13:29:35 -04:00
forms	Resolved differences merging 2.5.x into saas	2014-10-27 16:25:42 -04:00
layouts/scripts	Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas	2014-06-23 10:59:07 -04:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into saas	2014-10-28 10:29:42 -04:00
modules/rest	Merge branch 'saas' of github.com:sourcefabric/Airtime into saas	2014-10-29 18:01:31 -04:00
services	Fixed testcases to account for show image path in and show instance description	2014-10-09 09:39:50 -04:00
upgrade	Updated upgrade functions to have a directory parameter, since __DIR__	2014-09-19 12:58:31 -04:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merging 2.5.x into saas	2014-10-27 16:27:45 -04:00
Bootstrap.php	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-10-08 11:46:08 -04:00