Albert Santoni
|
1bb6ee63dc
|
SAAS-867: Embedded player spins in endless loop if connection is refused
|
2015-06-19 15:30:51 -04:00 |
|
Albert Santoni
|
74b403897d
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2015-06-19 14:23:46 -04:00 |
|
Albert Santoni
|
19adb062cf
|
SAAS-879 and add FAQ to Help menu
* SAAS-879: When trying to save changes in the user setting pages
changes do not save and goes to a "an error hass occured page"
|
2015-06-19 14:22:58 -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
|
62b4de5162
|
Merge branch 'saas' into saas-dev
Conflicts:
airtime_mvc/application/views/scripts/systemstatus/index.phtml
|
2015-06-18 10:24:44 -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
|
080c2c43b5
|
Add soundcloud callback file for saas routing
|
2015-06-17 17:39:37 -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
|
6e520f3bc0
|
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
|
2015-06-17 14:52:41 -04:00 |
|
Duncan Sommerville
|
af2f757985
|
Move misplaced tag
|
2015-06-17 14:52:04 -04:00 |
|
Duncan Sommerville
|
92ad5bde6d
|
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
|
2015-06-17 14:49:12 -04:00 |
|
Duncan Sommerville
|
149447b861
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-17 14:13:18 -04:00 |
|
Duncan Sommerville
|
8f59d18f34
|
Merge branch '2.5.x-installer' into saas-dev
|
2015-06-17 14:11:30 -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 |
|
Albert Santoni
|
8d114c7d6e
|
Merge branch '2.5.x' into 2.5.x-installer
|
2015-06-16 16:34:22 -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 |
drigato
|
a338616aca
|
Add max-width to logo on radio page
|
2015-06-16 15:38:21 -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
|
68a02e3c95
|
Radio page background scrolling issue on small screens
|
2015-06-16 12:53:07 -04:00 |
|
drigato
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -04:00 |
|
Albert Santoni
|
91d391c80c
|
Merge branch '2.5.x-installer' into saas-dev
Conflicts:
airtime_mvc/public/.htaccess
|
2015-06-16 11:32:45 -04:00 |
|
Albert Santoni
|
674d748149
|
CC-6058: htaccess should be combined into apache site config
|
2015-06-16 11:32:09 -04:00 |
|
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
|
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 |
|
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 |
|
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 |
|
Albert Santoni
|
b5b3d96b48
|
CC-6050: User management bugfix
|
2015-06-05 12:34:15 -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 |
|
drigato
|
2cf6cb549e
|
SAAS-833: Radio page UI improvements/fixes
Moved player bar buttons to float right
|
2015-06-02 16:27:37 -04:00 |
|
drigato
|
43815510dc
|
SAAS-833: Radio page UI improvements/fixes
Fix spacing between schedule widget and logo
|
2015-06-02 16:16:39 -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
|
fad88cb5ab
|
SAAS-833: Radio page UI improvements/fixes
Removed scrolling on entire page and added it only to schedule widget
|
2015-06-02 15:39:56 -04:00 |
|
drigato
|
db17112432
|
SAAS-833: Radio page UI improvements/fixes
Fix schedule widget responsiveness
|
2015-06-02 12:59:59 -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 |
|
drigato
|
6682f7907d
|
SAAS-833: Radio page UI improvements/fixes
Removed unnecessary/duplicate css classes from radio page css file
|
2015-06-01 15:07:04 -04:00 |
|
drigato
|
7e4d6995b5
|
SAAS-833: Radio page UI improvements/fixes
Removed unnecessary css classes from premium player css file
|
2015-06-01 15:02:12 -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 |
localizer
|
e011d61b81
|
updated translation resources
|
2015-05-28 09:35:12 +00: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 |
|
drigato
|
532bd1ea85
|
SAAS-772: Send metadata to Tunein
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
|
2015-05-25 15:37:45 -04:00 |
|
Albert Santoni
|
6fad0a3ee6
|
Merge branch 'saas-dev' into saas-installer-albert
|
2015-05-22 19:09:30 -04:00 |
|
Albert Santoni
|
6ca0e340a4
|
Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
python_apps/pypo/pypo/pypofile.py
|
2015-05-22 18:26:16 -04:00 |