Albert Santoni
|
609f073a25
|
Merge branch '2.5.x-installer' into saas-dev-plus
Conflicts:
airtime_mvc/public/css/styles.css
airtime_mvc/public/index.php
|
2015-06-16 11:20:43 -04:00 |
|
Albert Santoni
|
57d63ebb19
|
Backport some CSS fixes
|
2015-06-16 11:17:41 -04:00 |
|
Albert Santoni
|
8c9981a155
|
Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
airtime_mvc/public/index.php
|
2015-06-16 10:37:06 -04:00 |
|
Albert Santoni
|
aa286efee4
|
Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android
|
2015-06-15 17:54:28 -04:00 |
drigato
|
7d84e92b1b
|
Undo last commit
|
2015-06-15 16:40:47 -04:00 |
|
drigato
|
cd6e326e13
|
Radio page fix for background image on android
|
2015-06-15 16:36:29 -04:00 |
|
drigato
|
4c6ba869e3
|
Fix Radio Page schedule widget iframe size
|
2015-06-15 16:07:42 -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 |
|
drigato
|
0c4888fbd6
|
Radio Page fixes
Added scrolling back to radio page
|
2015-06-15 15:03:34 -04:00 |
|
drigato
|
507268a563
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-06-15 14:42:56 -04:00 |
|
drigato
|
ad5121f2ca
|
Radio Page improvements
|
2015-06-15 14:42: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 |
|
Albert Santoni
|
f4ff00355d
|
Added Radio Page link
|
2015-06-12 17:21:46 -04:00 |
|
Albert Santoni
|
0b5b2329ed
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-12 16:06:04 -04:00 |
|
drigato
|
1cdeddc3b3
|
Changed radio page background image
|
2015-06-12 14:50:22 -04:00 |
|
Albert Santoni
|
b4c9a77e7c
|
CC-6055: Improved escaping
|
2015-06-12 13:48:54 -04:00 |
|
Albert Santoni
|
abc81a92b4
|
XSS prevention for Radio Page
|
2015-06-12 13:11:28 -04:00 |
|
drigato
|
ba2aeae7b4
|
Radio page changes
Moved login button to top right corner.
Changed background image.
|
2015-06-12 13:07:47 -04:00 |
|
Duncan Sommerville
|
272911fa7b
|
Remove saas-specific configurations
|
2015-06-12 12:50:35 -04:00 |
|
Duncan Sommerville
|
15c7ef5885
|
Celery backend and support for dev-env worker parallelization
|
2015-06-12 12:31:55 -04:00 |
|
Albert Santoni
|
53b67d0826
|
Disabled most of status page for Airtime Pro and fixed HTML syntax errors
|
2015-06-12 10:36:27 -04:00 |
|
Albert Santoni
|
980e2ad767
|
Unbreak the design from my last commit
|
2015-06-11 15:09:44 -04:00 |
|
Albert Santoni
|
505d6fbc57
|
Fixed some issues with embedded schedule widget style
|
2015-06-11 15:04:59 -04:00 |
|
Albert Santoni
|
1efc47beb9
|
Tweaked layout of the embed widgets page
|
2015-06-11 14:30:52 -04:00 |
|
Albert Santoni
|
9c3979f3ba
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-11 14:22:03 -04:00 |
|
Albert Santoni
|
6007daf601
|
Adapted the default schedule widget skin to be more like the player skin
|
2015-06-11 14:21:56 -04:00 |
|
drigato
|
2dbed71681
|
SAAS-860: Schedule widget embed src is wrong
|
2015-06-11 12:37:51 -04:00 |
|
drigato
|
832f70d663
|
SAAS-859: Schedule widget -> Shows can display on the wrong day
|
2015-06-11 10:10:03 -04:00 |
|
drigato
|
255bbf74b7
|
CC-6057: Empty show schedule should show message in Schedule Widget
|
2015-06-11 09:16:59 -04:00 |
|
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 |
|
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 |