Commit graph

2582 commits

Author SHA1 Message Date
Albert Santoni
ffb55de566 SAAS-922 take 2 2015-07-15 13:12:56 -04:00
Duncan Sommerville
27fe32a3b4 Use mime-type array when checking for acceptable extensions 2015-07-15 12:58:05 -04:00
Duncan Sommerville
683c1a4641 SAAS-876 - use baseurl for default host value 2015-07-13 15:52:04 -04:00
Duncan Sommerville
9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
Duncan Sommerville
37ed35f5b2 Merge branch 'saas-dev' into saas-stream-settings
Conflicts:
	airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
drigato
0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Duncan Sommerville
6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville
e246771af0 SAAS-922 - additional mime-type coverage 2015-07-07 15:09:06 -04:00
Duncan Sommerville
92c9fd30b5 SAAS-922 - expose mime-based file extensions from /rest/media 2015-07-07 13:54:19 -04:00
Duncan Sommerville
5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
Duncan Sommerville
cb0593370a Quick fix 2015-07-04 00:38:53 -04:00
Duncan Sommerville
457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Albert Santoni
1c8ccbf0cd Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-06-29 16:36:38 -04:00
Albert Santoni
cffc3b7e59 Add semi-colon to Shoutcast URLs to make them work with our player 2015-06-29 16:36:19 -04:00
Duncan Sommerville
04290e28dc Fix error getting current schedule information if connected to master source 2015-06-29 14:25:00 -04:00
Duncan Sommerville
5cc8774e56 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
Duncan Sommerville
5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville
d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -04:00
Duncan Sommerville
67155b136a Add downgrade action to UpgradeController, fix SoundCloud schema and bugs 2015-06-24 18:38:04 -04:00
Duncan Sommerville
8fcaf7fc74 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Duncan Sommerville
e44e0de534 Add fields to SoundCloud upload 2015-06-24 15:46:53 -04:00
Duncan Sommerville
616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville
ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville
fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville
ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville
7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Duncan Sommerville
065988f703 Return default value for disk quota if none set 2015-06-23 19:08:49 -04:00
Duncan Sommerville
76a7aa9a24 Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items 2015-06-18 18:18:48 -04:00
Duncan Sommerville
0cd9b1d0e5 Merge branch 'saas-dev' into soundcloud 2015-06-16 15:10:14 -04:00
Duncan Sommerville
8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -04:00
Duncan Sommerville
3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00
Albert Santoni
5b6f4ca12a SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading 2015-06-15 12:19:03 -04:00
Duncan Sommerville
706d7db2b2 Merge branch 'saas-dev' into soundcloud 2015-06-15 11:03:37 -04:00
Duncan Sommerville
15c7ef5885 Celery backend and support for dev-env worker parallelization 2015-06-12 12:31:55 -04:00
Albert Santoni
0f3b68eed7 Default the Public Airtime API to being on 2015-06-10 17:55:04 -04:00
Duncan Sommerville
459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
Duncan Sommerville
626489bb3b SAAS-853 - Celery backend for SoundCloud uploads 2015-06-10 15:04:49 -04:00
Albert Santoni
c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -04:00
drigato
8e8f8aa55b Radio Page Code Review Changes
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -04:00
Albert Santoni
3996e757b7 Merge branch 'saas-dev' into saas-installer-albert 2015-06-10 12:02:08 -04:00
drigato
0796f58878 Merge branch 'saas-dev' into saas-landing-page 2015-06-10 11:14:02 -04:00
Albert Santoni
6126e8a51c Merge branch 'saas' into saas-dev 2015-06-10 11:02:59 -04:00
drigato
ca8ca0abed Merge branch 'saas-dev' into saas-landing-page 2015-06-10 09:07:12 -04:00
Albert Santoni
fb1fc6fb00 CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers 2015-06-09 17:14:33 -04:00
Duncan Sommerville
f031d13867 Merge branch 'saas-dev' into soundcloud 2015-06-09 14:03:03 -04:00
Duncan Sommerville
49165e91d9 SAAS-854 - celery-based SoundCloud backend uploader 2015-06-09 14:02:29 -04:00
drigato
87920c1fc1 SAAS-855: Default station description in Preferences 2015-06-09 09:01:15 -04:00
Albert Santoni
23dd6d4021 CC-6054: live-info-v2 returns future shows without ordering by start time 2015-06-08 16:38:17 -04:00
Albert Santoni
ada6b97873 CC-6050: User management bugfix 2015-06-05 12:34:51 -04:00
Duncan Sommerville
b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00