Commit Graph

4864 Commits

Author SHA1 Message Date
Albert Santoni 7c6f15984d Small consistency changes for the embeddable widgets 2015-06-10 18:02:25 -04:00
Albert Santoni 7dafb0e280 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-06-10 17:55:15 -04:00
Albert Santoni 0f3b68eed7 Default the Public Airtime API to being on 2015-06-10 17:55:04 -04:00
drigato 3ecad162e3 Serve radio page font style over https 2015-06-10 16:12:53 -04:00
drigato d1ac78be68 Fix for station logo....again... 2015-06-10 16:01:16 -04:00
drigato 357e17f3b4 Fix for station logo not displaying correctly 2015-06-10 15:57:09 -04:00
drigato fe5b20c29e Fix for default station logo not displaying 2015-06-10 15:51:31 -04:00
Albert Santoni 24db599afe Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-06-10 15:03:21 -04:00
Albert Santoni c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -04:00
drigato ffcd15190f Default station logo was not displaying 2015-06-10 14:46:27 -04:00
drigato ad40ea5c71 Disable removing UI elements from radio page when the login button is clicked 2015-06-10 12:56:31 -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
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
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
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