Commit graph

4954 commits

Author SHA1 Message Date
drigato
042e441708 Radio Page Code Review Changes
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
2015-06-10 11:13:03 -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
d181a931b8 Fix schedule widget layout by removing table structure 2015-06-09 10:30:47 -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
02d49864fa Squash some error notices in UserController 2015-06-08 15:17:48 -04:00
drigato
060280d5a5 Merge branch 'saas-dev' into saas-landing-page
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/IndexController.php
2015-06-08 14:55:24 -04:00
drigato
1974774e0c SAAS-851: Embed schedule widget loses format with long show names 2015-06-05 14:35:27 -04:00
Albert Santoni
ada6b97873 CC-6050: User management bugfix 2015-06-05 12:34:51 -04:00
Duncan Sommerville
14f37909d1 More robust error handling in show-logo action 2015-06-05 11:55:06 -04:00
Albert Santoni
dd4cbe5b63 CC-6051 - Route / generates invalid navigation bar links 2015-06-05 11:52:51 -04:00
Duncan Sommerville
f6e23ab075 Add more error handling to show-logo api 2015-06-04 18:45:00 -04:00
drigato
8386145cb9 SAAS-836: Create a new schedule widget skin 2015-06-04 16:09:19 -04:00
drigato
cae5f85b0a Fix typo 2015-06-04 12:17:48 -04:00
drigato
6528a9b0a3 SAAS-843: Create Embeddable Schedule Widget View
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
Duncan Sommerville
63b726e6b2 SAAS-848 - Modify SoundCloud code to use external redirect 2015-06-04 11:38:46 -04:00
Duncan Sommerville
b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
drigato
3593a13064 SAAS-842: Schedule widget show time formatting problem 2015-06-03 12:24:19 -04:00
drigato
305cb894c3 SAAS-841: Default station logo to the Airtime logo 2015-06-03 11:53:32 -04:00
drigato
d6ec9e99b5 Remove unused embed controller action 2015-06-03 10:12:19 -04:00
drigato
3de1d90241 Unhardcode premium style player
Had this is for testing purposes
2015-06-03 10:02:27 -04:00
drigato
3bf6619696 SAAS-833: Radio page UI improvements/fixes
Undo some previous css changes
2015-06-03 09:38:07 -04:00
drigato
9a42c4bf36 SAAS-833: Radio page UI improvements/fixes
Added width and height to schedule widget iframe tag
2015-06-03 09:18:38 -04:00
drigato
1add10c657 SAAS-833: Radio page UI improvements/fixes
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -04:00
drigato
2cf6cb549e SAAS-833: Radio page UI improvements/fixes
Moved player bar buttons to float right
2015-06-02 16:27:37 -04:00
Albert Santoni
01ea6f27ae Merge branch 'saas-dev' into saas-installer-albert
Conflicts:
	python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
drigato
b5e72d673f Next track in dashboard was wrong sometimes
Was not filtering by playout_status
2015-06-02 09:48:43 -04:00
Albert Santoni
a8d2290d00 SAAS-834: Login with WHMCS account doesn't work on suspended stations 2015-05-29 16:43:27 -04:00
drigato
30b81c398f SAAS-814: Decide what to do with new Login Page
We decided to link to the existing login page for now
2015-05-29 14:25:00 -04:00
drigato
24bfdbaa7f SAAS-811: Insert extra radio page buttons onto player bar
Insert extra buttons onto player bar once the iframe has loaded
2015-05-29 13:40:07 -04:00
drigato
77e518eec0 SAAS-821: Wire up new player bar with muses
Got metadata displaying
2015-05-29 09:40:50 -04:00
drigato
911c168765 SAAS-821: Wire up new player bar with muses
Play and stop is working
2015-05-29 09:14:23 -04:00
Albert Santoni
7a6184cf23 Merge branch 'saas' into saas-dev 2015-05-28 15:29:28 -04:00
Albert Santoni
187ef926ff Allow public APIs to be accessed with the API key regardless of the public API setting. 2015-05-28 15:28:51 -04:00
drigato
8f8b0b7f4d Merge branch 'saas-dev' into saas-landing-page
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
drigato
450300ddd8 Small TuneIn validation fix
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
drigato
018bb3a648 SAAS-823: Tunein preference check box issue 2015-05-28 11:54:23 -04:00
drigato
182b12e0e3 SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
Duncan Sommerville
b50aa15587 Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations 2015-05-27 15:16:13 -04:00
Duncan Sommerville
51a3f19f43 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-05-27 14:02:00 -04:00
Duncan Sommerville
1fa45bfc48 SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items 2015-05-27 14:01:49 -04:00
drigato
27868fbfe5 SAAS-813: Wire up schedule widget on Radio Page 2015-05-27 13:50:25 -04:00
drigato
a569387c5a Removed extra white space 2015-05-27 10:19:15 -04:00
drigato
a74a161936 SAAS-812: Remove live chat from radio page 2015-05-27 10:18:50 -04:00
drigato
2d577dbcb0 Small fix to embed player metadata 2015-05-27 10:09:13 -04:00
drigato
793e959cae SAAS-811: Insert extra radio page buttons onto player bar 2015-05-27 10:08:51 -04:00