Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud ... Conflicts: airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js		2015-06-26 10:37:30 -04:00
..
cloud_storage	Refactored file storage code slightly to allow multiple download URLs	2015-03-30 11:31:07 -04:00
common	Fixes to airtime-celery setup	2015-06-23 15:10:02 -04:00
configs	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
controllers	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
forms	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
layouts/scripts	SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences	2015-06-25 14:13:09 -04:00
logging	Attempt at fixing Sentry error logging	2015-06-16 14:35:29 -04:00
models	SoundCloud - Add release_year metadata field and set default sharing and license types	2015-06-25 10:53:35 -04:00
modules/rest	Add more error handling to show-logo api	2015-06-04 18:45:00 -04:00
services	SoundCloud - Add release_year metadata field and set default sharing and license types	2015-06-25 10:53:35 -04:00
upgrade	Add downgrade action to UpgradeController, fix SoundCloud schema and bugs	2015-06-24 18:38:04 -04:00
validate	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
views	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
airtime-boot.php	Attempt at fixing Sentry error logging	2015-06-16 14:35:29 -04:00
Bootstrap.php	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00