Duncan Sommerville 95aae317c6 Merge branch 'saas-dev' into saas-dev-publishing ... Conflicts: airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php airtime_mvc/public/css/dashboard.css airtime_mvc/public/js/airtime/library/spl.js		2015-10-29 11:21:24 -04:00
..
cloud_storage	SAAS-922 - urlencode content headers to ensure compatibility	2015-07-16 14:43:22 -04:00
common	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
configs	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
controllers	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
forms	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
layouts/scripts	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
logging	Attempt at fixing Sentry error logging	2015-06-16 14:35:29 -04:00
models	Merge branch 'saas-dev' into saas-dev-publishing	2015-10-29 11:21:24 -04:00
modules/rest	SAAS-1083 - work on publish dialog	2015-10-28 18:54:30 -04:00
services	Add TaskManager task to fail pending imports over an hour old	2015-10-29 11:03:28 -04:00
upgrade	SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable	2015-09-24 15:57:38 -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 saas-dev-publishing	2015-10-29 11:21:24 -04:00
Bootstrap.php	Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded	2015-10-29 10:12:26 -04:00
airtime-boot.php	Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"	2015-09-14 18:29:43 -04:00