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
|
adff664e87
|
Fix sending null fields to SoundCloud
|
2015-06-24 16:13:04 -04:00 |
|
Duncan Sommerville
|
e44e0de534
|
Add fields to SoundCloud upload
|
2015-06-24 15:46:53 -04:00 |
|
Duncan Sommerville
|
f26559c0c6
|
Fix permissions for SoundCloud functionality
|
2015-06-24 14:48:38 -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
|
4c797cf100
|
Update installer to work with saas branch
|
2015-06-23 19:02:55 -04:00 |
|
Duncan Sommerville
|
d48e594dcd
|
Fix upload to SoundCloud button remaining disabled after upload failure
|
2015-06-23 19:02:28 -04:00 |
|
Duncan Sommerville
|
70f6cbbc71
|
Fixes to airtime-celery setup
|
2015-06-23 15:10:02 -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
|
de184d761e
|
Rename variable
|
2015-06-18 13:49:25 -04:00 |
|
Duncan Sommerville
|
6439bc9ad5
|
Add timestamp on SoundCloud upload success
|
2015-06-18 13:32:43 -04:00 |
|
Duncan Sommerville
|
02e0537be9
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-18 13:29:59 -04:00 |
|
Duncan Sommerville
|
298ee30e9d
|
Move misplaced tag
|
2015-06-18 10:03:12 -04:00 |
|
Duncan Sommerville
|
88bd3c9bc2
|
SAAS-872 - Load disk information statically
|
2015-06-18 10:03:05 -04:00 |
|
Duncan Sommerville
|
afb02301c1
|
SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115
|
2015-06-17 17:16:21 -04:00 |
|
Duncan Sommerville
|
89e3eaa986
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 17:00:15 -04:00 |
|
Duncan Sommerville
|
af2f757985
|
Move misplaced tag
|
2015-06-17 14:52:04 -04:00 |
|
Duncan Sommerville
|
b42d773b5d
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 13:45:33 -04:00 |
|
Duncan Sommerville
|
4b3b3b5b93
|
SAAS-872 - Load disk information statically
|
2015-06-17 13:44:14 -04:00 |
|
Duncan Sommerville
|
27bebb9168
|
Remove logging statement
|
2015-06-17 13:09:56 -04:00 |
|
Duncan Sommerville
|
3a1d34dffe
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 10:14:03 -04:00 |
Albert Santoni
|
627343a626
|
Fixed the status page
|
2015-06-16 18:18:34 -04:00 |
|
Duncan Sommerville
|
e033360a4e
|
Fix error when deleting SoundCloud tracks
|
2015-06-16 16:21:31 -04:00 |
|
Albert Santoni
|
0f58e315e6
|
Merge branch 'saas-cc-6055' into saas
|
2015-06-16 16:13:40 -04:00 |
|
Albert Santoni
|
0b6fb9882a
|
Fix provisioning
|
2015-06-16 16:04:20 -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 |
|
Albert Santoni
|
61272cd42c
|
Handle 404s with the correct error page, and don't log them
|
2015-06-16 14:58:27 -04:00 |
|
Albert Santoni
|
90bd0a1ab4
|
Attempt at fixing Sentry error logging
|
2015-06-16 14:35:29 -04:00 |
drigato
|
709b9bbeec
|
CC-6059: Default station logo broken in Audio Preview popup
|
2015-06-16 13:37:05 -04:00 |
|
drigato
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -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 |
|
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
|
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 |