Duncan Sommerville
|
c1b5b53a16
|
Fix merge errors; use Celery status messages + handle fail case better
|
2015-06-10 17:11:42 -04:00 |
|
Duncan Sommerville
|
8163608666
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-10 16:25:30 -04:00 |
drigato
|
3ecad162e3
|
Serve radio page font style over https
|
2015-06-10 16:12:53 -04:00 |
|
Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -04:00 |
Albert Santoni
|
890f30590c
|
Reduced size of placeholder background PNG for Radio Page
|
2015-06-10 16:03:12 -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 |
|
drigato
|
f9dd70ad27
|
Fix for incorrectly displaying the installer screen
|
2015-06-10 15:38:27 -04:00 |
|
Duncan Sommerville
|
626489bb3b
|
SAAS-853 - Celery backend for SoundCloud uploads
|
2015-06-10 15:04:49 -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
|
816e620399
|
CSS fix on premium player
|
2015-06-10 13:04:51 -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 |
|
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 |
|
Albert Santoni
|
146146e35f
|
CC-6052: Fix problem with stream passwords
|
2015-06-08 14:18:19 -04:00 |
|
drigato
|
1b0d69f3d7
|
SAAS-851: Embed schedule widget loses format with long show names
Applied fix for premium style sheet
|
2015-06-08 11:14:05 -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 |
|
Duncan Sommerville
|
80bfb7fd93
|
SAAS-848 - Add soundcloud_callback file
|
2015-06-04 12:01:04 -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
|
df501d7a38
|
SAAS-841: Default station logo to the Airtime logo
logo image file
|
2015-06-03 11:54:05 -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 |